From 55f6627d40d978db83cc0b1d6690fe0408179d9c Mon Sep 17 00:00:00 2001 From: NeLepus Date: Mon, 21 Oct 2024 21:23:00 +0700 Subject: [PATCH 01/23] Added armband sprites --- .../armband_blue.rsi/equipped-NECK.png | Bin 0 -> 384 bytes .../Armband/armband_blue.rsi/icon.png | Bin 0 -> 337 bytes .../Armband/armband_blue.rsi/meta.json | 18 ++++++++++++++++++ .../armband_green.rsi/equipped-NECK.png | Bin 0 -> 387 bytes .../Armband/armband_green.rsi/icon.png | Bin 0 -> 337 bytes .../Armband/armband_green.rsi/meta.json | 18 ++++++++++++++++++ .../armband_purple.rsi/equipped-NECK.png | Bin 0 -> 372 bytes .../Armband/armband_purple.rsi/icon.png | Bin 0 -> 337 bytes .../Armband/armband_purple.rsi/meta.json | 18 ++++++++++++++++++ .../Armband/armband_red.rsi/equipped-NECK.png | Bin 0 -> 376 bytes .../Uniforms/Armband/armband_red.rsi/icon.png | Bin 0 -> 260 bytes .../Armband/armband_red.rsi/meta.json | 18 ++++++++++++++++++ .../armband_white.rsi/equipped-NECK.png | Bin 0 -> 364 bytes .../Armband/armband_white.rsi/icon.png | Bin 0 -> 337 bytes .../Armband/armband_white.rsi/meta.json | 18 ++++++++++++++++++ .../armband_yellow.rsi/equipped-NECK.png | Bin 0 -> 360 bytes .../Armband/armband_yellow.rsi/icon.png | Bin 0 -> 337 bytes .../Armband/armband_yellow.rsi/meta.json | 18 ++++++++++++++++++ 18 files changed, 108 insertions(+) create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/meta.json diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..a2dcb2bed925c5df19e76ef1d43ae9250aa5489b GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TRx zr;B4q#hkaZ4EY!xCEWgtF1(bHvv}jhmq&PW4%+6tx8hq=$Wq8Mwau-$!{txj0iTxi zpK(TaeLj6MI+QmhMDGejE176dXt1ZFK@xO;I+h8SZT!rpiR(B7lyk;PC@5N1j(^79gwW+-M$#+TfM)TXXyJgC@#hp21 zbJsSbq)nKAu6JL=`315cPQMUAvjM|O90Ceuj?={Bw*6=7@8FuicPuV{i_WvZe{Zim zrnf_;EX-2=ZJF)f!_ObTsGNgvJ$9r1*&UE=U--!^i%)$9Fi06ZUHx3vIVCg!02_Uc A>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6a643a2bbf133e68a9763578661004ca933b710d GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQLT z#W5tJ_3gE@TulxF>>p-&Sh;Y#RAh>GsA?+Y?8$oknU{;EE(@pi7bc!lT^ z|1S)yF1>wa?ep~G9EJs2-9~*Lm(H&?(poT6<8f_Pe1=QCaM@$M*H822O*+YNS8Mj< zUEXi6FFa?jxSN}y;oSCn>2(GPT@wGrK+Y0qC_Er-aK>(p{I89lfu80|jqptK^<~fk WvN?bl1TF&0Vzt`7dT6?`OobubSX_H{hKZTg` z4{=Q|3cpxS&}%%bDBv_{$L?BV-lzsQ#tcR&)&;B?A`M~-0vR9zvlcKMEs0sp?cDQz zKV#R+8&s_tjk^E< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6a643a2bbf133e68a9763578661004ca933b710d GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQLT z#W5tJ_3gE@TulxF>>p-&Sh;Y#RAh>GsA?+Y?8$oknU{;EE(@pi7bc!lT^ z|1S)yF1>wa?ep~G9EJs2-9~*Lm(H&?(poT6<8f_Pe1=QCaM@$M*H822O*+YNS8Mj< zUEXi6FFa?jxSN}y;oSCn>2(GPT@wGrK+Y0qC_Er-aK>(p{I89lfu80|jqptK^<~fk WvN?bl1TFrPHxM$ zpXZ#vPtv|-e6jk#p+JVH1~tQjH=Vhe~9P_uG~FR|PHpXq%E*9R&4<7e*w zpR4ojfU5QF>p-&Sh;Y#RAh>GsA?+Y?8$oknU{;EE(@pi7bc!lT^ z|1S)yF1>wa?ep~G9EJs2-9~*Lm(H&?(poT6<8f_Pe1=QCaM@$M*H822O*+YNS8Mj< zUEXi6FFa?jxSN}y;oSCn>2(GPT@wGrK+Y0qC_Er-aK>(p{I89lfu80|jqptK^<~fk WvN?bl1TFHP|t`|O0frWCVfFyv3+JHQ}i`JOEyjVb8fSB5YalV_{iIbDTUEPJry5#tBZ wnzJl#+ILFtS7zWkc0FBb$5|%bc*nKUyvv00bMtSr04-(kboFyt=akR{0J7UraR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/meta.json new file mode 100644 index 00000000000..1a9f8f0c358 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by nelepus & miller4040", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc431fdf11bbc657bf31ddb832d3d57d4807b39 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TR+ zr;B4q#hkaZc5@vvU~r8t6e!rlx4reFJ7_7ud*jvg%s@2TbHHu;$tCyi=MBg z440zH&LwZ=XI@}3;d9`=V8Nj4@R(r>LoYK_z=f4#;h$B!&Xd+J*`2&I#$(dD^X>01 zD_=E#wfJ>zKy3Id@y-2x2Ks5MUVFXH?f7;kdHdnncfJ1J)2RQpy+(ZHyo-!=qU)KE z48*VjkH8W?j)ftmcmAJgObTi^S+eF~!GzLVch~PWDeO*r)#AMMeAM&H+A#t(Hhx%K fj$&@T`~xP(EnCyV7hFvR1|Nf`tDnm{r-UW|>0gJ( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6a643a2bbf133e68a9763578661004ca933b710d GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQLT z#W5tJ_3gE@TulxF>>p-&Sh;Y#RAh>GsA?+Y?8$oknU{;EE(@pi7bc!lT^ z|1S)yF1>wa?ep~G9EJs2-9~*Lm(H&?(poT6<8f_Pe1=QCaM@$M*H822O*+YNS8Mj< zUEXi6FFa?jxSN}y;oSCn>2(GPT@wGrK+Y0qC_Er-aK>(p{I89lfu80|jqptK^<~fk WvN?bl1TFb;+2$JwL1EBtv`h4})1#TO&iyTRVkTPiehruy5~VK3A7ZR`Yd&zE9G=e)+51 zh9a0z7-r)aILUXxOwRka{)gT*4D&x0pZin$E~l73W?kC$_M3lya?kz0_@jlc!(xUl r482Sjm`u1FxG!ihpb4z8JHQ?J;LUw^5eGwH&@p(r`njxgN@xNAv@nDb literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6a643a2bbf133e68a9763578661004ca933b710d GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQLT z#W5tJ_3gE@TulxF>>p-&Sh;Y#RAh>GsA?+Y?8$oknU{;EE(@pi7bc!lT^ z|1S)yF1>wa?ep~G9EJs2-9~*Lm(H&?(poT6<8f_Pe1=QCaM@$M*H822O*+YNS8Mj< zUEXi6FFa?jxSN}y;oSCn>2(GPT@wGrK+Y0qC_Er-aK>(p{I89lfu80|jqptK^<~fk WvN?bl1TF Date: Mon, 21 Oct 2024 21:23:12 +0700 Subject: [PATCH 02/23] Added armband entities --- .../Entities/Clothing/Uniforms/armbands.yml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml new file mode 100644 index 00000000000..85c4091ab3d --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -0,0 +1,66 @@ +- type: entity + parent: ClothingNeckBase + id: LPPArmbandRed + name: red armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi + +- type: entity + parent: LPPArmbandRed + id: LPPArmbandGreen + name: green armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi + +- type: entity + parent: LPPArmbandRed + id: LPPArmbandBlue + name: blue armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi + +- type: entity + parent: LPPArmbandRed + id: LPPArmbandYellow + name: yellow armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi + +- type: entity + parent: LPPArmbandRed + id: LPPArmbandPurple + name: purple armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi + +- type: entity + parent: LPPArmbandRed + id: LPPArmbandWhite + name: white armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + \ No newline at end of file From 68014df1ed4538c6b9a5b13d27d40d2064170c79 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Mon, 21 Oct 2024 22:44:31 +0700 Subject: [PATCH 03/23] Added translation files --- .../prototypes/entities/objects/clothing/armband.ftl | 12 ++++++++++++ .../prototypes/entities/objects/clothing/armband.ftl | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 Resources/Locale/en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl diff --git a/Resources/Locale/en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl b/Resources/Locale/en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl new file mode 100644 index 00000000000..3acd8003452 --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl @@ -0,0 +1,12 @@ +ent-LPPArmbandRed = red armband + .desc = A red armband. Smells like blood. I guess. +ent-LPPArmbandGreen = green armband + .desc = Green armband, reflecting affiliation with a specific patrol group. +ent-LPPArmbandBlue = blue armband + .desc = Blue armband. The color of this armband is said to make some officers twitch. +ent-LPPArmbandYellow = yellow armband + .desc = Yellow armband, reflecting affiliation with a certain patrol group. +ent-LPPArmbandPurple = Magenta armband + .desc = Magenta armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. +ent-LPPArmbandWhite = White armband + .desc = White armband, reflecting affiliation with a specific patrol group. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl new file mode 100644 index 00000000000..a9586e018f4 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl @@ -0,0 +1,12 @@ +ent-LPPArmbandRed = красная нарукавная повязка + .desc = Красная нарукавная повязка. Пахнет кровью. Кажется. +ent-LPPArmbandGreen = зелёная нарукавная повязка + .desc = Зелёная нарукавная повязка, отражающая принадлежность определенной патрульной группе. +ent-LPPArmbandBlue = синяя нарукавная повязка + .desc = Синяя нарукавная повязка. Говорят, цвет этой повязки доводит некоторых сотрудников до нервного тика. +ent-LPPArmbandYellow = жёлтая нарукавная повязка + .desc = Жёлтая нарукавная повязка, отражающая принадлежность определенной патрульной группе. +ent-LPPArmbandPurple = малиновая нарукавная повязка + .desc = Малиновая нарукавная повязка, отражающая принадлежность определенной патрульной группе. Ношение данной повязки в сочетании с красной униформой официально признано нарушением статьи 106 действующего Корпоративного Закона. +ent-LPPArmbandWhite = белая нарукавная повязка + .desc = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе. \ No newline at end of file From a6e9d0e6d015367d75915b3cff7e4e7a9d76721e Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 00:00:06 +0700 Subject: [PATCH 04/23] Replaced icon placeholders --- .../Uniforms/Armband/armband_blue.rsi/icon.png | Bin 337 -> 347 bytes .../Uniforms/Armband/armband_green.rsi/icon.png | Bin 337 -> 384 bytes .../Armband/armband_purple.rsi/icon.png | Bin 337 -> 387 bytes .../Uniforms/Armband/armband_red.rsi/icon.png | Bin 260 -> 368 bytes .../Uniforms/Armband/armband_white.rsi/icon.png | Bin 337 -> 398 bytes .../Armband/armband_yellow.rsi/icon.png | Bin 337 -> 354 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png index 6a643a2bbf133e68a9763578661004ca933b710d..2a7197c386497f3d165d011fff1bea5abf812c52 100644 GIT binary patch delta 313 zcmV-90mlB(0^0(RD}N5e000ie0hKEb8vp|6{CpWi^_k1odP2!go))p8lqE&uufuld9$!kdR6w0#O`ma}qD!2yb<3=GU{3=DsM zFfbgPgAjL2Cv5rY)l^Ia+RhMzxdkBfgR=-l_9-M=PP79s9D?i^77j?rz#L=XOSI)A zJAf$1+&Rj?z%oF5fkd_ga5{zr%c% zmOMMR^VgG0Ub8m6kZUZt;NZfcf7$Wcdd;H1n|z=5>*#g=o}F4Q+R5RQmR3^6$l<`i z^n?9COu9jv-R|u#D_qU^1a-0*T|Y|kH!SoQcwXxMpzumsZ2h7Ri7bN!rW=!)RWg6d zJQrot`!2Ngz90jGte?H&uj&IEZ|91OSBNh0|H829(%VHKOV ztpzhR9@l2YXSmc0mp#^d{WNdhq>~JHwPsJ=<^A^h!gKbDySW(}&TYS!UT2WdCGlSj zgTe~DWM4fQ~P#9 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png index 6a643a2bbf133e68a9763578661004ca933b710d..3884228d694a255d3aad96eac3b0e6484b5b4629 100644 GIT binary patch delta 350 zcmV-k0ipiU0)PXMD}N5e000ie0hKEb8vp1R9J=Wl`%`hKp2Lft1(Sc3oRWA z4laU=WE2Tb4*mfl(7!0S`V*uSbPz{z5ZqNl6H6fu$C0E>a@QJ(!@bJ~$H%=--phR_ z(ln(_by{_|02aUkSb+Zk;OH8J5bKNnVR3#xy_Yl==&h!?Q$!D0!w)2u%S^ZNu$%v}er&t;7gP|4J!Vg^ta`>4Neu4#g0;Lf8Td=M9MBCpycvMJs$d>o<=RT@ w%}qk3qQS zOP-zE`RmCguUVU3$TgN+aB$(!zwCHzy=GD1O}@|jb@aM_&rU5D?d0%DODid3d4>Fq0PpQj(^Ff7pOHtO@Zbbhsw z)`FQDk888yGhFJ0%O2~!ewsIL(n*H9TC*qb@_u`L;W>N7-P{Zf=eFNVuQN#KlK3wM za+g3u;Q?ubGj?m_e`##|4D>c%YJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkK>1B24 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/icon.png index 6a643a2bbf133e68a9763578661004ca933b710d..d294dcacdbca43d5757cfe429e7449783e46d2c0 100644 GIT binary patch delta 353 zcmV-n0iOQR0)qpPD}N5e000ie0hKEb8vpKH~+DkF5uKmGa4 zAjvAm@a6AU27VSkh9CcbGE8|hAFiGl#}MrRVl3xiWQWrq|9^a9nEiekL5C3K0Bpf7 z%_@P{avo-GhF5>yFz_++GE9HF2&W?m<^p8P z?$3LMW8crh)mjvaq>^ko(GEa&2(n{1m^c`I{QCiSOc=i}(Uz0!0Ad`o@9R+p1_t5_ zB(fcV%Q2)_PBjNm0tUP`9Cg5`14bP%;0^!)8K>XAF0($&00000NkvXXu0mjf4(^=z delta 303 zcmZo>zQ{B|yPjK^fq`3?kzv*x2?hp+m!2+;ArY-_ubt&;au8tuFw?`zh2y0nQ@le> zOP-zE`RmCguUVU3$TgN+aB$(!zwCHzy=GD1O}@|jb@aM_&rU5D?d0%DODid3d4>Fq0PpQj(^Ff7pOHtO@Zbbhsw z)`FQDk888yGhFJ0%O2~!ewsIL(n*H9TC*qb@_u`L;W>N7-P{Zf=eFNVuQN#KlK3wM za+g3u;Q?ubGj?m_e`##|4D>c%YJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkK?DBQ& diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/icon.png index 8f836fd4517a2ba14b9f861115d4cbeda1c5eb0d..dd834c7b8d9c388d24a3cab0caf7c4ff9e2ab046 100644 GIT binary patch delta 352 zcmV-m0iXVa0`LNm8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00AONL_t(o zh3(a`PQpMO$MN4?uN1L{CTzq7-owp=$=wGb@g-bLTv&V$6K0-;0ip$gn)dGRA{B_V z|0~2g+$~L-w%<=L*Q+2R)H!6Wbq8<&2XKJ@08mwKx>erZ{(n8rwD>c?Ha=+j=r?@4 zX}t%s#R!|9(P2E+gs$?iB!fswBt&?MSNZiE3>(0SH-*TL@5W%XSeHUrfZwM5TKR?X zDG$K#pd9gZ*DE$g{hV9TQ-jc=d$O7C13V{$<6X7xb z$j?7SVQKtjxmh{i8o0Y?U~UXLQetilCZ9jkJ8Xy6aW>!(vWsbb&&(Ece;Kgj)&LG> yoTLEw8&YM!F^o<8Y=Bcn?SDfDZ~zCW9qkAy=58T^K0J;CAldG$6%R666>B9|RaS?_aVXD8gCb5n0T@zztNzEzHO; zYmNj^Fw@h;F~q|E?FC1n1_d5w2akt2|KrUju4)yueKB#)j15y7L*h3%oZhdXxzA3x zYf3R&21EW7z5@(WmhagT(wKtoePsw^F?qJCozqo##j*!G9x;9ptvSo`rhTXMeq{!( kW7pG_cARC>jdxrt&AUt}KR5q23(!^uPgg&ebxsLQ0AaCFSO5S3 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png index 6a643a2bbf133e68a9763578661004ca933b710d..ad14c5b9ad75ca8c86fc19a3d9e8e2dd00c0e021 100644 GIT binary patch delta 364 zcmV-y0h9jG0*(WaD}N5e000ie0hKEb8vp&MKcNa0d5054LTiu4@38cYnVl^J{@Eylq>Urimzu zplKTVzJDxpTi^(87zVnoo8giqA&z56l7yydW|=FITLMR8H%)T~pPo(AKv5KgVF*=K zCy_%5<}FylEz7zMFUu0Ds-mi@%l&U3L7JujfFwyC!DU&#+?TNah&<059mjzn2pEO| zMNzDzSnx0mk!5AsDTgUQ2$_$;_kB=Gq3b#*r7M{vNlxLwc@NwYn6fOONk$aK)ntMo z*ug(0u*{iEp63AeSMOs@IAsHPT+LIM6Zq@A{x#$RT!0I_F7N~VS>pH?$iYnj0000< KMNUMnLSTaSsh+L? delta 303 zcmeBUzQ{B|yPjK^fq`3?kzv*x2?hp+m!2+;ArY-_ubt&;au8tuFw?`zh2y0nQ@le> zOP-zE`RmCguUVU3$TgN+aB$(!zwCHzy=GD1O}@|jb@aM_&rU5D?d0%DODid3d4>Fq0PpQj(^Ff7pOHtO@Zbbhsw z)`FQDk888yGhFJ0%O2~!ewsIL(n*H9TC*qb@_u`L;W>N7-P{Zf=eFNVuQN#KlK3wM za+g3u;Q?ubGj?m_e`##|4D>c%YJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkK`S*4A diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png index 6a643a2bbf133e68a9763578661004ca933b710d..5800bd007b292115a40314935f4bc50c854371f5 100644 GIT binary patch delta 320 zcmV-G0l)sy0^$OYD}N5e000ie0hKEb8vpge~t~M8z}^VQ!Pj5=Vz9RL6^6szc% Soit_u0000% zmOMMR^VgG0Ub8m6kZUZt;NZfcf7$Wcdd;H1n|z=5>*#g=o}F4Q+R5RQmR3^6$l<`i z^n?9COu9jv-R|u#D_qU^1a-0*T|Y|kH!SoQcwXxMpzumsZ2h7Ri7bN!rW=!)RWg6d zJQrot`!2Ngz90jGte?H&uj&IEZ|91OSBNh0|H829(%VHKOV ztpzhR9@l2YXSmc0mp#^d{WNdhq>~JHwPsJ=<^A^h!gKbDySW(}&TYS!UT2WdCGlSj zgTe~DWM4fTts$C From 7b1b6d1c4d37b2292dcca3b2ae4d5dab72a5361a Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 00:04:38 +0700 Subject: [PATCH 05/23] Added armband box entity --- .../catalog/fills/boxes/armband_box.ftl | 2 ++ .../catalog/fills/boxes/armband_box.ftl | 2 ++ .../Catalog/Fills/Boxes/security.yml | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 Resources/Locale/en-US/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl create mode 100644 Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml diff --git a/Resources/Locale/en-US/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl b/Resources/Locale/en-US/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl new file mode 100644 index 00000000000..2fc8676dc88 --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl @@ -0,0 +1,2 @@ +ent-LPPBoxArmband = armband box + .desc = A box of armbands. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl new file mode 100644 index 00000000000..3b07a4c52c5 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl @@ -0,0 +1,2 @@ +ent-LPPBoxArmband = Коробка нарукавных повязок + .desc = Надпись мелким шрифтом гласит, что внутри должен быть набор нарукавных повязок. Не применять для остановки кровотечения. \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml new file mode 100644 index 00000000000..3d5d4cf1f1b --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml @@ -0,0 +1,27 @@ +- type: entity + name: armband box + parent: BoxCardboard + id: LPPBoxArmband + description: A box of armbands. + components: + - type: Item + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: LPPArmbandRed + amount: 2 + - id: LPPArmbandGreen + amount: 2 + - id: LPPArmbandBlue + amount: 2 + - id: LPPArmbandYellow + amount: 2 + - id: LPPArmbandPurple + amount: 2 + - id: LPPArmbandWhite + amount: 2 + - type: Sprite + layers: + - state: box_security + - state: flashbang From c1ac0c1933059eaad1af656891203d1fe1f27e3a Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 00:05:30 +0700 Subject: [PATCH 06/23] Fixed uppercase letters in armband translations --- .../entities/objects/clothing/armband.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl index a9586e018f4..8973a174a90 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl @@ -1,12 +1,12 @@ -ent-LPPArmbandRed = красная нарукавная повязка +ent-LPPArmbandRed = Красная нарукавная повязка .desc = Красная нарукавная повязка. Пахнет кровью. Кажется. -ent-LPPArmbandGreen = зелёная нарукавная повязка +ent-LPPArmbandGreen = Зелёная нарукавная повязка .desc = Зелёная нарукавная повязка, отражающая принадлежность определенной патрульной группе. -ent-LPPArmbandBlue = синяя нарукавная повязка +ent-LPPArmbandBlue = Синяя нарукавная повязка .desc = Синяя нарукавная повязка. Говорят, цвет этой повязки доводит некоторых сотрудников до нервного тика. -ent-LPPArmbandYellow = жёлтая нарукавная повязка +ent-LPPArmbandYellow = Жёлтая нарукавная повязка .desc = Жёлтая нарукавная повязка, отражающая принадлежность определенной патрульной группе. -ent-LPPArmbandPurple = малиновая нарукавная повязка - .desc = Малиновая нарукавная повязка, отражающая принадлежность определенной патрульной группе. Ношение данной повязки в сочетании с красной униформой официально признано нарушением статьи 106 действующего Корпоративного Закона. -ent-LPPArmbandWhite = белая нарукавная повязка +ent-LPPArmbandPurple = Фиолетовая нарукавная повязка + .desc = Фиолетовая нарукавная повязка, отражающая принадлежность определенной патрульной группе. Ношение данной повязки в сочетании с красной униформой официально признано нарушением статьи 106 действующего Корпоративного Закона. +ent-LPPArmbandWhite = Белая нарукавная повязка .desc = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе. \ No newline at end of file From d8221a114669cba0ea5137bc29a11e06efe118f5 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 00:05:57 +0700 Subject: [PATCH 07/23] Made armbands single storage cell items --- .../Entities/Clothing/Uniforms/armbands.yml | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index 85c4091ab3d..39519f1aa80 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -1,8 +1,22 @@ - type: entity parent: ClothingNeckBase + id: LPPArmbandWhite + name: white armband + description: + components: + - type: Item + shape: + - 0,0,0,0 + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + +- type: entity + parent: LPPArmbandWhite id: LPPArmbandRed name: red armband - description: + description: components: - type: Sprite sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi @@ -10,7 +24,7 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi - type: entity - parent: LPPArmbandRed + parent: LPPArmbandWhite id: LPPArmbandGreen name: green armband description: @@ -19,9 +33,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi - + - type: entity - parent: LPPArmbandRed + parent: LPPArmbandWhite id: LPPArmbandBlue name: blue armband description: @@ -30,9 +44,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi - + - type: entity - parent: LPPArmbandRed + parent: LPPArmbandWhite id: LPPArmbandYellow name: yellow armband description: @@ -41,9 +55,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi - + - type: entity - parent: LPPArmbandRed + parent: LPPArmbandWhite id: LPPArmbandPurple name: purple armband description: @@ -52,15 +66,3 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi - -- type: entity - parent: LPPArmbandRed - id: LPPArmbandWhite - name: white armband - description: - components: - - type: Sprite - sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - \ No newline at end of file From 906dd7d0e8b0ffe2b68184ff0dccc8ed5a017bf6 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 15:17:14 +0700 Subject: [PATCH 08/23] Added an abstract parent for the armbands --- .../Entities/Clothing/Uniforms/armbands.yml | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index 39519f1aa80..8c288ae22f3 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -1,19 +1,32 @@ - type: entity - parent: ClothingNeckBase + abstract: true + parent: ClothingNeckBase # Will be implemented as attachment instead of clothing later + id: LPPArmband + components: + - type: Tag + tags: + - LPPArmband + - type: Item + size: Tiny + - type: Butcherable + butcheringType: Knife + spawned: + - id: MaterialCloth1 + amount: 1 + +- type: entity + parent: LPPArmband id: LPPArmbandWhite name: white armband description: components: - - type: Item - shape: - - 0,0,0,0 - type: Sprite sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - type: entity - parent: LPPArmbandWhite + parent: LPPArmband id: LPPArmbandRed name: red armband description: @@ -24,7 +37,7 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi - type: entity - parent: LPPArmbandWhite + parent: LPPArmband id: LPPArmbandGreen name: green armband description: @@ -35,7 +48,7 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi - type: entity - parent: LPPArmbandWhite + parent: LPPArmband id: LPPArmbandBlue name: blue armband description: @@ -46,7 +59,7 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi - type: entity - parent: LPPArmbandWhite + parent: LPPArmband id: LPPArmbandYellow name: yellow armband description: @@ -57,7 +70,7 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi - type: entity - parent: LPPArmbandWhite + parent: LPPArmband id: LPPArmbandPurple name: purple armband description: From 4a8b851d07333355324b746c0c2aceb8d70a29ab Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 15:17:47 +0700 Subject: [PATCH 09/23] Added armband box sprite --- .../Catalog/Fills/Boxes/security.yml | 21 ++++++++++++------ .../Objects/Storage/boxes.rsi/armband.png | Bin 0 -> 252 bytes .../Storage/boxes.rsi/box_security.png | Bin 0 -> 288 bytes .../Objects/Storage/boxes.rsi/meta.json | 17 ++++++++++++++ 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/_LostParadise/Objects/Storage/boxes.rsi/armband.png create mode 100644 Resources/Textures/_LostParadise/Objects/Storage/boxes.rsi/box_security.png create mode 100644 Resources/Textures/_LostParadise/Objects/Storage/boxes.rsi/meta.json diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml index 3d5d4cf1f1b..6dc84dbcdfd 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml @@ -7,21 +7,28 @@ - type: Item shape: - 0,0,1,1 + - type: Storage + grid: + - 0,0,5,2 + whitelist: + tags: + - LPPArmband - type: StorageFill contents: - id: LPPArmbandRed - amount: 2 + amount: 3 - id: LPPArmbandGreen - amount: 2 + amount: 3 - id: LPPArmbandBlue - amount: 2 + amount: 3 - id: LPPArmbandYellow - amount: 2 + amount: 3 - id: LPPArmbandPurple - amount: 2 + amount: 3 - id: LPPArmbandWhite - amount: 2 + amount: 3 - type: Sprite + sprite: _LostParadise/Objects/Storage/boxes.rsi layers: - state: box_security - - state: flashbang + - state: armband diff --git a/Resources/Textures/_LostParadise/Objects/Storage/boxes.rsi/armband.png b/Resources/Textures/_LostParadise/Objects/Storage/boxes.rsi/armband.png new file mode 100644 index 0000000000000000000000000000000000000000..32e0b4de1e09882ee41f9e9cd31ef27abd0f4f92 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C^*H_ z#W5tJ_3gEdoQDkrS|7$2a%3<}eYeTs+X=DlQ={`2s_to6Eg?S7VZpOYl6PDM0zSw6 zblBDJ+}gDJvhntHmstfI7#LYVL__uK#yQ3(&pbAmb2oh!lY`Oc>)TqV{dRgiJx9|0 ze)isy^Ad~^-VbYKd>fwezS;U|#`9tiqt9DK8od8!&ock;zNEf|i9?}*;VxtRm3s96 mm%00xf$rl=jqptK^<~fkvN?bl1TFq0|PH;4JWnEM{QfI|Ravq8eTeK*3B;7sn6_|GSee@---M zxL#Da{OA9B-|Ml7i$8|&&)eBq{+w|}h-{j02E#%j4HwrP#drR5Ft=^skvPPB#4AC~ zM4-Aif?Gv Date: Wed, 23 Oct 2024 15:18:04 +0700 Subject: [PATCH 10/23] Added armband tags for the box whitelist --- Resources/Prototypes/_LostParadise/tags.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/_LostParadise/tags.yml b/Resources/Prototypes/_LostParadise/tags.yml index a0b455d6877..937650e2165 100644 --- a/Resources/Prototypes/_LostParadise/tags.yml +++ b/Resources/Prototypes/_LostParadise/tags.yml @@ -163,3 +163,8 @@ - type: Tag id: LPPProcessedDiamond + +# [Тэги экипировки] + +- type: Tag + id: LPPArmband # Нарукавная повязка From ede1f81abfb0cc02fc0369554bd73537bf9cf3a1 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 16:32:32 +0700 Subject: [PATCH 11/23] Added armbands box to the HoS locker contents --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index be307f5afdd..4bfecee06bd 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -337,6 +337,8 @@ - id: HoSIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 +#LPP + - id: LPPBoxArmband - type: entity id: LockerHeadOfSecurityFilled @@ -367,6 +369,8 @@ - id: HoSIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 +#LPP + - id: LPPBoxArmband - type: entity id: LockerFreezerVaultFilled From efb8c6bcbd4c008106fb961eea641c314f52fec5 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 17:01:48 +0700 Subject: [PATCH 12/23] Added clothing lather recipes for armbands --- .../Entities/Structures/Machines/lathe.yml | 7 +++ .../Recipes/Lathes/ClothinglatheRecipe.yml | 45 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4ffb270203b..9f4c2a8fd4b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1177,6 +1177,13 @@ - CarpetPurple - CarpetCyan - CarpetWhite + # LPP + - LPPArmbandRed + - LPPArmbandGreen + - LPPArmbandBlue + - LPPArmbandWhite + - LPPArmbandYellow + - LPPArmbandPurple - type: EmagLatheRecipes emagStaticRecipes: - ClothingHeadHatCentcomcap diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/ClothinglatheRecipe.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/ClothinglatheRecipe.yml index e82a418c1b5..f6373caedc0 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/ClothinglatheRecipe.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/ClothinglatheRecipe.yml @@ -712,3 +712,48 @@ completetime: 4 materials: Cloth: 300 + +# [Armbands] + +- type: latheRecipe + id: LPPArmbandRed + result: LPPArmbandRed + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: LPPArmbandGreen + result: LPPArmbandGreen + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: LPPArmbandBlue + result: LPPArmbandBlue + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: LPPArmbandWhite + result: LPPArmbandWhite + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: LPPArmbandYellow + result: LPPArmbandYellow + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: LPPArmbandPurple + result: LPPArmbandPurple + completetime: 1 + materials: + Cloth: 100 + \ No newline at end of file From 54ee52609efda855cd87383663dd4dcef8b7a7f6 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Wed, 23 Oct 2024 17:02:05 +0700 Subject: [PATCH 13/23] Rearranged armband lists --- .../Catalog/Fills/Boxes/security.yml | 4 ++-- .../Entities/Clothing/Uniforms/armbands.yml | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml index 6dc84dbcdfd..ebea9cabfb6 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Boxes/security.yml @@ -21,12 +21,12 @@ amount: 3 - id: LPPArmbandBlue amount: 3 + - id: LPPArmbandWhite + amount: 3 - id: LPPArmbandYellow amount: 3 - id: LPPArmbandPurple amount: 3 - - id: LPPArmbandWhite - amount: 3 - type: Sprite sprite: _LostParadise/Objects/Storage/boxes.rsi layers: diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index 8c288ae22f3..556361e6150 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -14,17 +14,6 @@ - id: MaterialCloth1 amount: 1 -- type: entity - parent: LPPArmband - id: LPPArmbandWhite - name: white armband - description: - components: - - type: Sprite - sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - - type: entity parent: LPPArmband id: LPPArmbandRed @@ -58,6 +47,17 @@ - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi +- type: entity + parent: LPPArmband + id: LPPArmbandWhite + name: white armband + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + - type: entity parent: LPPArmband id: LPPArmbandYellow From 1c75623944d657c951cd9fd86cb54e987a27377b Mon Sep 17 00:00:00 2001 From: NeLepus Date: Fri, 25 Oct 2024 18:56:27 +0700 Subject: [PATCH 14/23] Changed palette for better contrast --- .../entities/objects/clothing/armband.ftl | 2 +- .../Armband/armband_blue.rsi/equipped-NECK.png | Bin 384 -> 261 bytes .../Uniforms/Armband/armband_blue.rsi/icon.png | Bin 347 -> 265 bytes .../Armband/armband_green.rsi/equipped-NECK.png | Bin 387 -> 261 bytes .../Uniforms/Armband/armband_green.rsi/icon.png | Bin 384 -> 266 bytes .../armband_purple.rsi/equipped-NECK.png | Bin 372 -> 258 bytes .../Armband/armband_purple.rsi/icon.png | Bin 387 -> 271 bytes .../Uniforms/Armband/armband_red.rsi/icon.png | Bin 368 -> 269 bytes .../Armband/armband_white.rsi/equipped-NECK.png | Bin 364 -> 259 bytes .../Uniforms/Armband/armband_white.rsi/icon.png | Bin 398 -> 320 bytes .../armband_yellow.rsi/equipped-NECK.png | Bin 360 -> 262 bytes .../Armband/armband_yellow.rsi/icon.png | Bin 354 -> 284 bytes 12 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl index 8973a174a90..634e386a795 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl @@ -7,6 +7,6 @@ ent-LPPArmbandBlue = Синяя нарукавная повязка ent-LPPArmbandYellow = Жёлтая нарукавная повязка .desc = Жёлтая нарукавная повязка, отражающая принадлежность определенной патрульной группе. ent-LPPArmbandPurple = Фиолетовая нарукавная повязка - .desc = Фиолетовая нарукавная повязка, отражающая принадлежность определенной патрульной группе. Ношение данной повязки в сочетании с красной униформой официально признано нарушением статьи 106 действующего Корпоративного Закона. + .desc = Фиолетовая нарукавная повязка, отражающая принадлежность определенной патрульной группе. ent-LPPArmbandWhite = Белая нарукавная повязка .desc = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе. \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-NECK.png index a2dcb2bed925c5df19e76ef1d43ae9250aa5489b..1f6d9c706ac391a3063778d87149bc75ed8602b3 100644 GIT binary patch delta 225 zcmZo*Ze^Mv8OqGSz%X}v;~OBwSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#}z$e62 z)G|>aY?7dHh>S}B9|RaS?_aWiqM~>`LzbtDV@QPi+pDL! z4k+-r1fG5TzkVmr5>+S1UhA2=GsV8mn0uCA*?}RJ^-aLbH|E>)49`yfSH6D5QIpdq zcc)Ifc|&2J2IE!^0S6Wi1tyjYxeX#a{&Z(neGivr$b9YpCpz(^Arp%LBh$Ng{Os2L WYuCwd`VDjmgQu&X%Q~k7#wGwypHqkc literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TRx zr;B4q#hkaZ4EY!xCEWgtF1(bHvv}jhmq&PW4%+6tx8hq=$Wq8Mwau-$!{txj0iTxi zpK(TaeLj6MI+QmhMDGejE176dXt1ZFK@xO;I+h8SZT!rpiR(B7lyk;PC@5N1j(^79gwW+-M$#+TfM)TXXyJgC@#hp21 zbJsSbq)nKAu6JL=`315cPQMUAvjM|O90Ceuj?={Bw*6=7@8FuicPuV{i_WvZe{Zim zrnf_;EX-2=ZJF)f!_ObTsGNgvJ$9r1*&UE=U--!^i%)$9Fi06ZUHx3vIVCg!02_Uc A>i_@% diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/icon.png index 2a7197c386497f3d165d011fff1bea5abf812c52..8c3f1e1ff0aacfa5ef4338bf728bec0133579583 100644 GIT binary patch delta 229 zcmcc3)X6kKGLo5rfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=$Az$e6& zL(5yrW|o4}CLxnDF^g7Kb)X7{nx+}=fE0U4kYDhBFkq1KW_FvXC|=Ky<>}%WV&VU` z&ynwd0tX9YY-P3A=ko*cq0DP2JFU$1m*LrcZ7& zvi|m22EX|leKewS%?&1@?lW`lv#eH7n>dMmp>~e0rT?LviGQYS{}?`hj+Tvullxbu ZiO0p7?l)Bn0iD9&>FVdQ&MASh2>?wDR}BCF delta 331 zcmV-R0kr;!0^0(R8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~009k2L_t(o zg=75x|3AY(0;U1AebfP?4j6U7r~?Lr16at>#He72Qhxt`aGa5D4uD&(ZpXkND9ga` z;}eR5NOcS&DU}h1=+gfNJPlM9An^1wB;l_fGEe@Im*DmKzxBjwgYfFh6Ky0<^W2-fY*kj4j6U7 dr~?Mv0RRfHt4vjOj{pDw002ovPDHLkV1h6?jXwYY diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/equipped-NECK.png index 9454d3424fd305f52e1443d0e468546534b878e8..a577dc2916ccee21090d467999cc9d2080dbc601 100644 GIT binary patch delta 225 zcmZo>Ze^Mv8OqGSz%X}v;~OBwSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#}z$e62 zJ>1f!F;vOd$S}o)-$({1{87{T9gt!x3Gxg64+0FE_b=H$QBk~}A%hul3B`nPT5&%stDm?7$Gq`X=Dz8}n^?hG!@LD__6jsL5%Q zyHls#yrHm9gK;Z|fCCGM0u#%H+y;>yf4VcPzK2UQWWM(Q6P@_dkcmZrk?Gw#es*jB Wwd>?J{RX;(!PC{xWt~$3V-o&0Vzt`7dT6?`OobubSX_H{hKZTg` z4{=Q|3cpxS&}%%bDBv_{$L?BV-lzsQ#tcR&)&;B?A`M~-0vR9zvlcKMEs0sp?cDQz zKV#R+8&s_tjk^E< diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/icon.png index 3884228d694a255d3aad96eac3b0e6484b5b4629..761e0fb7aa4b3ef7cfd17803d9d7b9a6980b76bc 100644 GIT binary patch delta 230 zcmZo*?qZrC8OhARz~Hi^>llz?EDmyaVpw-h<|UBBlJ4m1$iT3%pZiZDE08Z5;1lA? zZzLlUtS?z=CDmXjJIRI5P#P#B&#lx5q}WS>{DS|30fUq`v)e>P@p^`APZ!4!3;(wh z9EA=ja4>fU{rmrf=@!>3pM2Yy-EC_wPJH6bp7BdsA@u&fE@mZ>GaegSq7FRh;c-ql zf6(;mx2#lO-cc7$%?K Zed8x4wl(>43eYVKp00i_>ztSpngGa(Q{(^u delta 368 zcmV-$0gwKQ0)PXM8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00A;dL_t(o zh3%CwOT$1IhM%i3O;HOi9SROEf{SDn2~H0F0U^-8D7g9)q!e@zM{y9`RYDU>Ar8lp zq)l?y8i~Wb%Lm8Dy-(iDeJ9d1rA>8Ob+-T(zyer+{{Z0V8h?Zk>x=$jaehC&moybs zHS)CpmF8#1Fdje@17y1!z~m)#k5M6kRr7fQ!vlyHuX$ zjS^7F)TCktP!{{BzizH-lt9mgD_yfv*v#B> z8vyW+V0Q<;muYZwpRG?W^yYVuwf}(GEl|f0oWNHM{hqAPZ&_m))S6fMYSO5#qI=~Mtv!k1=<4B$W O0000Mx&04>-^Y^>Fw1a)YG8gwBF(0~%YyksmT2#Jw%HZy+~FE@AoZUO)R z@W?9rp>4bH(Y!Tmn_-w`(?toDv+{nlgc@1{Ct3b<36-yMe&w=y`UBb)00000007{9 z_m|@K*}YL)pHk1y<18{R%{ue!{-T7J3MiKxbIKvtoZATi0000TNp34@DPICz9#a4S N002ovPDHLkV1gB(R1W|E literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TR) zr;B4q#hkaZHu5$(NVwH=1Z-q&HQg({gF*YkO)pLE3p-o6EjnAdC4`gxf2_^rPHxM$ zpXZ#vPtv|-e6jk#p+JVH1~tQjH=Vhe~9P_uG~FR|PHpXq%E*9R&4<7e*w zpR4ojfU5QF?q`}H8OzMTz~Hi^>llz?EDmyaVpw-h<|UBBlJ4m1$iT3%pZiZDE08Y{;1l91 z$Ka;RkZ#4$>dmmKoZ-I<_`3W~;68SriDkdt5mr8}ZXvg`D?)nR3;1JE@Lp00i_>zJJqngAq;R>1%O delta 371 zcmV-(0gV2S0)qpP8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00A{gL_t(o zg=75x|3AY(0;U1AebfP?4j6U7r~?Lr16at>(}d4Dq>uAUgj5bXeBEazZk zhtnVbd}5gWei=cB5aj@D!7j}zf!A^#W^RU8f8H?gG4nD^f4c~$BM9aKWXt6_WJtFB z?VtB}%_lk$?)rL=f#E9yL!n42NtSamaZ>I8Yc5j;c1AXaAOC(Z^uL)67cUXbAZYo* z_p7Lv27Gv37;N7CdCwrkBFOOW&wGYr-_OF;6pEyhY&p>mKz9hTV>p;N7=HZw0e4Io zzc102lk5Ou9JBB1Q3eJE;tM3Q9e~R*q*zWh2T%eAyfz$lz^DU89WdYy000@M-@Y!h RKFk0B002ovPDHLkV1hb@pril* diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/icon.png index dd834c7b8d9c388d24a3cab0caf7c4ff9e2ab046..6507979799a74817e4509a91ca7337da94912e9a 100644 GIT binary patch delta 233 zcmeys)XOwMGM1Tvfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#@z$e5t zNR)q@sNi)`q4lDIM@5AkMERD83IZj&Jx+rtj*=k1;QtW7aIbl9X|ZLkWvJ?UB%1ejyZv_4tX delta 352 zcmV-m0iXVj0`LNm8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00AONL_t(o zh3(a`PQpMO$MN4?uN1L{CTzq7-owp=$=wGb@g-bLTv&V$6K0-;0ip$gn)dGRA{B_V z|0~2g+$~L-w%<=L*Q+2R)H!6Wbq8<&2XKJ@08mwKx>erZ{(n8rwD>c?Ha=+j=r?@4 zX}t%s#R!|9(P2E+gs$?iB!fswBt&?MSNZiE3>(0SH-*TL@5W%XSeHUrfZwM5TKR?X zDG$K#pd9gZ*DE$g{hV9TQ-jc=d$O7C13V{$<6X7xb z$j?7SVQKtjxmh{i8o0Y?U~UXLQetilCZ9jkJ8Xy6aW>!(vWsbb&&(Ece;Kgj)&LG> yoTLEw8&YM!F^o<8Y=Bcn?SDfDZ~zCW9qzopr0J1Dy*#H0l literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TR+ zr;B4q#hkaZc5@vvU~r8t6e!rlx4reFJ7_7ud*jvg%s@2TbHHu;$tCyi=MBg z440zH&LwZ=XI@}3;d9`=V8Nj4@R(r>LoYK_z=f4#;h$B!&Xd+J*`2&I#$(dD^X>01 zD_=E#wfJ>zKy3Id@y-2x2Ks5MUVFXH?f7;kdHdnncfJ1J)2RQpy+(ZHyo-!=qU)KE z48*VjkH8W?j)ftmcmAJgObTi^S+eF~!GzLVch~PWDeO*r)#AMMeAM&H+A#t(Hhx%K fj$&@T`~xP(EnCyV7hFvR1|Nf`tDnm{r-UW|>0gJ( diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/icon.png index ad14c5b9ad75ca8c86fc19a3d9e8e2dd00c0e021..0e61533afc887abc08be3c8df0c9cc96ec32cfd9 100644 GIT binary patch delta 285 zcmeBUKEO0VvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv_Ojz$e5t zK0bc`{{3&>yt#Vy>Wv#We*OCO>eZ|N|Nnpf{Q33k*YDrIzkU1m#*G_y?%cU<-MYt* zA0Iz{9H@0o-Si%DX zLR$XUhjF=Ns(yUdxpzugTU*12iF!}|=qfCed4GjDL1Jpis%bw=vJX#P?)hCgz9%i) zTXmn5xrOG@WD&rXeIl(nG?2m^goc*Oj2qM-{rvh bkg4jc-HSTrk^ml{6B#^R{an^LB{Ts5O8t+M delta 363 zcmV-x0hIp00*(Wa83+ad0047(di0T=7k>djNkl0E#dZ~-px z9|XQx3kV^*cdqNM`a8?A{i03IDxWEE2KPJ+mIo=ww0Q51w>2vt=l zkwXdQEm*=W%eoCO%Mz-pqN=LP{cj&Znx+7NBuO5@Wm&%5m$3ebJkJ{)$AKUS7={5w zQLLm`@GuOKW!Wi*DL@FBkHPnSP*_T#>pCcWP%{r z!9OOj%$ZD{=K%Is?_*6kWdnFz%~O~Y`0Kp>HRJ+ZfD61X@B{o=;`kTH!A$@F002ov JPDHLkV1hfkpPv8# diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/equipped-NECK.png index e9289d3bb4ee7cbcaadcf524d6c26a48c0271789..47b6877a8933da230dba1ddafb86cd8c82a15a8d 100644 GIT binary patch delta 226 zcmaFC)W$SHGL)Htfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g{fKQ0) zr8P`nPcp6SVwzgTxMvn4P?&$y=P5vntt7}V_&*3RY~H_Q|3pRcdWLLI7srqY_qSIa zxeh4sxLi~*`@X+Ol0&t%NoqIOXY;d%?2h(6Y8O;!h+?!3iTd5MNbIuB<@L3`Za$ma zmh8QhXyzvnKcyjxg+qafMSziMg>(X|-hU&P^%B>s8K=qrJNj>LvlmE`m*KngJYN4L VV$-Io0iD9&>FVdQ&WS0Z2>|wgQZ)bo literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|TR! zr;B4q#hkaZHu4@a5O94j;GELvapr(RX7FYP)t4PpST}iYJHevU;L_Z(qMzxa(C&um z8vi}t<-B}Z`t7Fjp=)Q_#1;fHL^ZfEW-v;zE?~_NX@Cf*X*%5hxk!)4a^GaeU+0qd z8)wf>b;+2$JwL1EBtv`h4})1#TO&iyTRVkTPiehruy5~VK3A7ZR`Yd&zE9G=e)+51 zh9a0z7-r)aILUXxOwRka{)gT*4D&x0pZin$E~l73W?kC$_M3lya?kz0_@jlc!(xUl r482Sjm`u1FxG!ihpb4z8JHQ?J;LUw^5eGwH&@p(r`njxgN@xNAv@nDb diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/icon.png index 5800bd007b292115a40314935f4bc50c854371f5..df3c3ec1eda1aad652b7b83c6363b41a62618b49 100644 GIT binary patch delta 248 zcmaFFG>2(|WF|8M1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKQ0) z$}Xl$YnUGGWcqrN>Ba`8{}-6w9%7nW#dvQE!}h5_MGVz(kNklYcS(?6@P9a9@bYK; zG*MB!o*~!M#WBRf|83uCp#}vGhNJ8={{KHXvx~{>^4iJO1qbeKjQRP1W$t|DaLLC` zcPu_A=AFDX+uv|zO5U5=PpcldR`_gsFjMQzLsNz`F5#bFNf)afl6jT*hie{-z=;aU pFX0~5vRmq9g_E1+3foL6VlLaQnk8Ah;4jE!p00i_EbE*SngD(xXqNy0 delta 338 zcmV-Y0j>U=0^$OY8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~009(9L_t(o zg=75x|3AY(0;U1AebfP?4j6U7r~?Lr16at>6zIr^Qhu-B|DTa=4uDx6>dL^Nroh1P z_C2bDNOcS&DU}hr Date: Fri, 25 Oct 2024 18:56:54 +0700 Subject: [PATCH 15/23] Made armbands also work as blindfolds --- .../Entities/Clothing/Uniforms/armbands.yml | 4 ++++ .../armband_white.rsi/equipped-EYES-tajaran.png | Bin 0 -> 268 bytes .../armband_white.rsi/equipped-EYES-vulpkanin.png | Bin 0 -> 268 bytes .../Armband/armband_white.rsi/equipped-EYES.png | Bin 0 -> 269 bytes .../Uniforms/Armband/armband_white.rsi/meta.json | 12 ++++++++++++ 5 files changed, 16 insertions(+) create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES.png diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index 556361e6150..1c4623edcf3 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -3,6 +3,10 @@ parent: ClothingNeckBase # Will be implemented as attachment instead of clothing later id: LPPArmband components: + - type: Clothing + slots: [neck, eyes] + - type: Blindfold + - type: FlashImmunity - type: Tag tags: - LPPArmband diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-EYES-tajaran.png new file mode 100644 index 0000000000000000000000000000000000000000..b5cd3c2909c6266f7d4d90b9cc5baa8ca308c0f2 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y9y@mI`Sa%w9z6K=?c1F@ca9!C3Y7WJwRI7YVlN5u3;quV3{u|A zZa^W<0*}aI1_r((Aj~*bn@<`jnCt1{7!u+B_L?CdgCd7ZU`p$6`I|ipCusEUzM59I zSnX4kXuV|PddAEZCa&^JD%HYD_H0mDmk*R}$(d7Y0N%z@lnK{#h5k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y9y@mI`Sa%w9z6K=?c1F@ca9!C3Y7WJwRI7YVlN5u3;quV3{u|A zZa^W<0*}aI1_r((Aj~*bn@<`jnCt1{7!u+B_L?CdgCd7ZU`p$6`I|ipCusEUzM59I zSnX4kXuV|PddAEZCa&^JD%HYD_H0mDmk*R}$(d7Y0N%z@lnK{#h5k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y9y@mI!Gj0izJ0rM=g!fiN1s1`4wUI`*f;@5v6lq-1^)*F1}Sf5 zH=qz_fk$L90|Va?5N4dJ%_j{M%=2_{42f`md(}|rfC7h0VCRFs{cqMRoS@V&3ZdeGsb2$)DCC_xKaWaR10}F=&lRZP!>(-38*E6>?H3MyC@O1TaS?83{ F1OUCuW&Z#G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/meta.json index 1a9f8f0c358..edc0aa117d4 100644 --- a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-NECK", "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-EYES-tajaran", + "directions": 4 } ] } From 33fbcc9e413430107843abd91d79adbda60b983b Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sat, 26 Oct 2024 22:01:19 +0700 Subject: [PATCH 16/23] Replaced EYES slot with HEAD --- .../Entities/Clothing/Uniforms/armbands.yml | 19 ++++++++++++++---- .../armband_blue.rsi/equipped-HELMET.png | Bin 0 -> 428 bytes .../Armband/armband_blue.rsi/meta.json | 4 ++++ .../armband_green.rsi/equipped-HELMET.png | Bin 0 -> 430 bytes .../Armband/armband_green.rsi/meta.json | 4 ++++ .../armband_purple.rsi/equipped-HELMET.png | Bin 0 -> 435 bytes .../Armband/armband_purple.rsi/meta.json | 4 ++++ .../armband_red.rsi/equipped-HELMET.png | Bin 0 -> 431 bytes .../Armband/armband_red.rsi/meta.json | 4 ++++ .../armband_white.rsi/equipped-HELMET.png | Bin 0 -> 1680 bytes .../Armband/armband_white.rsi/meta.json | 4 ++++ .../armband_yellow.rsi/equipped-HELMET.png | Bin 0 -> 435 bytes .../Armband/armband_yellow.rsi/meta.json | 4 ++++ 13 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_white.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/equipped-HELMET.png diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index 1c4623edcf3..c603850b523 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -4,12 +4,23 @@ id: LPPArmband components: - type: Clothing - slots: [neck, eyes] - - type: Blindfold - - type: FlashImmunity + slots: + - NECK + - HEAD + - type: Food + requiresSpecialDigestion: true + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Fiber + Quantity: 5 - type: Tag tags: - - LPPArmband + - LPPArmband + - ClothMade + - WhitelistChameleon - type: Item size: Tiny - type: Butcherable diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d0a4fa7521a7b9c340690e9f75b3be6a3ec0e363 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R56 zr;B4q#hkaZ?7faS$hhqn+#abDA{Omv=<(eTjYkR8}b%r z2K~_y3x7O6iS4ZOr@d+u1fHFpJt0lawdL3uK3#{$3|kn^=Dp)yxyrfPIJ4|i-R4NI z^SzJWY5iSxM_|dE`47rIUH-eC|Mph}!JyFgKEI_eAGU7{zx25F;*ChgjBVTsU&R;3 z=C5Pr{;;0u59{LpoK_4FLwlJoFq!ZO2GIR!_DW+_dL?YFWz31H?8aTX~%Qy zOMWUyL28e@*B9v&c4xEhuD&YBk-NUDYS<$?5-QninVX{Q3!# m6aI~t7sPKl|NbXgE--I(3)?7=EcXx?0Sun5elF{r5}E+?Q>Tgm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/meta.json index 1a9f8f0c358..e9636202f98 100644 --- a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_green.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-NECK", "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..b18210915d78008efbfa2ed33b4ea716f815d07f GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R5K zr;B4q#hkaZ484vxNVx46+_*t-W3*1lo`wl|=MyJezv0zco3pps_gtd*2ew_UOQNsk zisaOBce-pk+hWRp^7|>y#JGDcnQ1{T8K>S{WHRA%;J)zY`M!Wfu7@``EF=jAIu`giFkZBNGP)L+O+9$?M@7cH9S)#Vf{fhV1UHwT@ zelvE5xPPxZ6xExTY?krv&EEf{ni9y4rV=w&7(aP|pv4P$m$SkRe{(^9}# OVDNPHb6Mw<&;$Vf38qf~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/meta.json index 1a9f8f0c358..e9636202f98 100644 --- a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-NECK", "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_red.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..15fd02f4dd1eb91b932690470a2ed778fb232ff1 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R5C zr;B4q#hkaZ9KDVhNVxqs<87965V+H=eNcGES0=e5&0iFXx%?H*oZ{wS-Yn{-Vz!@K z*VrmgXbb<#@8913{}i;#Q>uKs<>gCECR`5O7fP1$e=+V?>pLZDCUMmA)QLu0=awg5yZKh}>8hKqj2Xvx4L0k~-XLjrEnqX_ zf2{-Y2EXSoV7dS?R)ay;VKKuNhF;Fy7=?o z-mti~$BuS3j3^P6 zc3Kb-@s^+h0uN0S8iNmr@?hizA{tE~CMFV$Xdp3~zQ_Y&BvIr6JhQieqE$AToik^? z^Zoz#-{$p!{BTy^)7|M!fs@5ya}op{crsD=lED@09AFQKS= zel}7=-jMn%(6Grt9j6iJn>ImHRQqb*hT16d=rqb2mcm>)`3XZCy25O1RRz`VMmZxf z>7Wgh{V8p7RFidPbqC$<143XT57NGww_M;WOpzCmb+FAdbP?i>Doj^kkRDP8=x*#F zTINJn69kEl$sCNrXjqP}q9s9!@IsguC02-mNE?vCbos{+bB>+?gYjp|#>kVxyCS>^?amn4=TSa-tmpwC)vQ-vXpT+K0T&%hQPFv2t*_Y{V>TGC+J zRa(m}$B9IY_o2;;oDgU#0(Gs5v&Wr$(YUVhD345Jc`m_LZZ!q%h7`GBr?f znU-2PnO?ckuykB-n{PRQ;?P416J(7Q1y+it#3*PLfhe~KVIT-4sETzXGx2w542T5U zb{mw`j1E0GCs@}&20JDsf(;X95pP>rhOUMYbmKgBh+*Pgxaftdf~4ho(9%#ct}sM1 zXBaxr5Nr*%g%KN*(-MndB+aHHg20NJC__CRK^l@P=i^u#4>DUhum8{U>l}l$7R=u@ zPtb5dNq~gml4MPkJ7NPGE3fhfU918CwV=8cMhnu4bf&y*+;s#>w1pfZr2mrc63oRJ zuK*p?l_k-dvz&P1JRkI7NeBN|iN$xf^lSxA20^f_jv(?-9b(8Llgl9^N{v2oiK0S@ zWV|coPhXxA-+W1Uux9yD<>h7ZFBWfmXyH#suhnsTmuue`GYg{kLRXV zJkPA@J@U=)q3F!{3m=C*KX7B-Ta9}TFZyikg^SVTxf92R52CiKU-s4bwKwX{&5JDT zY&hFSv7NKjN7Nhh&;Hj9uhv)IIrY_j+jf2X$F7rokBrQ}|K0s7lE=@_Zr{EB&}(~K zOFTV${l|gcOH+%lUEcfM?;}^+Z$AC%&6eM|^zL<69y_ys--+3+9XlSL8KZ`GoDP-s hJv!&csg6$@mxxHrL`(hHJ*C%Z6m~iY|oci;EyuXtLo@T#n+r@Pd=A_f-aM;YnCoP|$i9FzL#9D&K_Np_!!gDTMk(S1)Z`Va?G~utYc;W1^iC|O*7#hF zgE@bu#e9M3L8Xz~%D%lUxZP4xr}XxH?!A85hs$SAUvl02XEtw|<-W zDt)gy-TwED_QzPSoOQlvx&Jvc(e}ffoc4+F9^<9GVO|TCzy1%51qM%7KbLh*2~7ZT C1FBg7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/meta.json index 1a9f8f0c358..e9636202f98 100644 --- a/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-NECK", "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 } ] } From 0f63de3f81980cbf6be336cf5c7219717fa70a6b Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sat, 26 Oct 2024 22:24:30 +0700 Subject: [PATCH 17/23] Added flavors for moth consumption --- .../Entities/Clothing/Uniforms/armbands.yml | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index c603850b523..71ddd1eae69 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -5,8 +5,8 @@ components: - type: Clothing slots: - - NECK - - HEAD + - NECK + - HEAD - type: Food requiresSpecialDigestion: true - type: SolutionContainerManager @@ -14,13 +14,13 @@ food: maxVol: 5 reagents: - - ReagentId: Fiber - Quantity: 5 + - ReagentId: Fiber + Quantity: 5 - type: Tag tags: - - LPPArmband - - ClothMade - - WhitelistChameleon + - LPPArmband + - ClothMade + - WhitelistChameleon - type: Item size: Tiny - type: Butcherable @@ -39,6 +39,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_red.rsi + - type: FlavorProfile + flavors: + - tomato - type: entity parent: LPPArmband @@ -50,6 +53,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_green.rsi + - type: FlavorProfile + flavors: + - apple - type: entity parent: LPPArmband @@ -61,6 +67,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_blue.rsi + - type: FlavorProfile + flavors: + - berry - type: entity parent: LPPArmband @@ -72,6 +81,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_white.rsi + - type: FlavorProfile + flavors: + - creamy - type: entity parent: LPPArmband @@ -83,6 +95,9 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_yellow.rsi + - type: FlavorProfile + flavors: + - cheesy - type: entity parent: LPPArmband @@ -94,3 +109,6 @@ sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Armband/armband_purple.rsi + - type: FlavorProfile + flavors: + - grape From 22eeaeaaa6d82a746fa2f4148ad5f6d4fdcbc45e Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sat, 26 Oct 2024 22:38:30 +0700 Subject: [PATCH 18/23] Disabled quick equip due to slot conflicts --- .../_LostParadise/Entities/Clothing/Uniforms/armbands.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml index 71ddd1eae69..d90b4ec8d02 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/armbands.yml @@ -4,9 +4,10 @@ id: LPPArmband components: - type: Clothing + quickEquip: false slots: - - NECK - - HEAD + - neck + - head - type: Food requiresSpecialDigestion: true - type: SolutionContainerManager From 7d0888f9d3bbdb88080005b8dc0470713bdf5c7c Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sun, 27 Oct 2024 03:53:34 +0700 Subject: [PATCH 19/23] Moved translation files --- .../prototypes/_lostparadise/catalog/fills/boxes/security.ftl} | 0 .../_lostparadise/entities/clothing/uniforms/armbands.ftl} | 0 .../prototypes/_lostparadise/catalog/fills/boxes/security.ftl} | 0 .../_lostparadise/entities/clothing/uniforms/armbands.ftl} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/en-US/{_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl => ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl} (100%) rename Resources/Locale/{ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl => en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl} (100%) rename Resources/Locale/ru-RU/{_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl => ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl} (100%) rename Resources/Locale/{en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl => ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl} (100%) diff --git a/Resources/Locale/en-US/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl similarity index 100% rename from Resources/Locale/en-US/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl rename to Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl similarity index 100% rename from Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/clothing/armband.ftl rename to Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl similarity index 100% rename from Resources/Locale/ru-RU/_LostParadise/prototypes/catalog/fills/boxes/armband_box.ftl rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl diff --git a/Resources/Locale/en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl similarity index 100% rename from Resources/Locale/en-US/_LostParadise/prototypes/entities/objects/clothing/armband.ftl rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl From ed64ec619d6bf8fa8fdbf5c908b738f9831b44c5 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sun, 27 Oct 2024 04:21:53 +0700 Subject: [PATCH 20/23] Switched EN and RU translations --- .../entities/clothing/uniforms/armbands.ftl | 24 +++++++++---------- .../entities/clothing/uniforms/armbands.ftl | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl index 634e386a795..3acd8003452 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl @@ -1,12 +1,12 @@ -ent-LPPArmbandRed = Красная нарукавная повязка - .desc = Красная нарукавная повязка. Пахнет кровью. Кажется. -ent-LPPArmbandGreen = Зелёная нарукавная повязка - .desc = Зелёная нарукавная повязка, отражающая принадлежность определенной патрульной группе. -ent-LPPArmbandBlue = Синяя нарукавная повязка - .desc = Синяя нарукавная повязка. Говорят, цвет этой повязки доводит некоторых сотрудников до нервного тика. -ent-LPPArmbandYellow = Жёлтая нарукавная повязка - .desc = Жёлтая нарукавная повязка, отражающая принадлежность определенной патрульной группе. -ent-LPPArmbandPurple = Фиолетовая нарукавная повязка - .desc = Фиолетовая нарукавная повязка, отражающая принадлежность определенной патрульной группе. -ent-LPPArmbandWhite = Белая нарукавная повязка - .desc = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе. \ No newline at end of file +ent-LPPArmbandRed = red armband + .desc = A red armband. Smells like blood. I guess. +ent-LPPArmbandGreen = green armband + .desc = Green armband, reflecting affiliation with a specific patrol group. +ent-LPPArmbandBlue = blue armband + .desc = Blue armband. The color of this armband is said to make some officers twitch. +ent-LPPArmbandYellow = yellow armband + .desc = Yellow armband, reflecting affiliation with a certain patrol group. +ent-LPPArmbandPurple = Magenta armband + .desc = Magenta armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. +ent-LPPArmbandWhite = White armband + .desc = White armband, reflecting affiliation with a specific patrol group. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl index 3acd8003452..634e386a795 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl @@ -1,12 +1,12 @@ -ent-LPPArmbandRed = red armband - .desc = A red armband. Smells like blood. I guess. -ent-LPPArmbandGreen = green armband - .desc = Green armband, reflecting affiliation with a specific patrol group. -ent-LPPArmbandBlue = blue armband - .desc = Blue armband. The color of this armband is said to make some officers twitch. -ent-LPPArmbandYellow = yellow armband - .desc = Yellow armband, reflecting affiliation with a certain patrol group. -ent-LPPArmbandPurple = Magenta armband - .desc = Magenta armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. -ent-LPPArmbandWhite = White armband - .desc = White armband, reflecting affiliation with a specific patrol group. \ No newline at end of file +ent-LPPArmbandRed = Красная нарукавная повязка + .desc = Красная нарукавная повязка. Пахнет кровью. Кажется. +ent-LPPArmbandGreen = Зелёная нарукавная повязка + .desc = Зелёная нарукавная повязка, отражающая принадлежность определенной патрульной группе. +ent-LPPArmbandBlue = Синяя нарукавная повязка + .desc = Синяя нарукавная повязка. Говорят, цвет этой повязки доводит некоторых сотрудников до нервного тика. +ent-LPPArmbandYellow = Жёлтая нарукавная повязка + .desc = Жёлтая нарукавная повязка, отражающая принадлежность определенной патрульной группе. +ent-LPPArmbandPurple = Фиолетовая нарукавная повязка + .desc = Фиолетовая нарукавная повязка, отражающая принадлежность определенной патрульной группе. +ent-LPPArmbandWhite = Белая нарукавная повязка + .desc = Белая нарукавная повязка, отражающая принадлежность определенной патрульной группе. \ No newline at end of file From f682e1c414499665ce547ac59008bc9466ccf6cb Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sun, 27 Oct 2024 16:23:51 +0700 Subject: [PATCH 21/23] Update Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../_lostparadise/entities/clothing/uniforms/armbands.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl index 3acd8003452..f03ad1d09a3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl @@ -1,10 +1,10 @@ -ent-LPPArmbandRed = red armband +ent-LPPArmbandRed = Red armband .desc = A red armband. Smells like blood. I guess. -ent-LPPArmbandGreen = green armband +ent-LPPArmbandGreen = Green armband .desc = Green armband, reflecting affiliation with a specific patrol group. -ent-LPPArmbandBlue = blue armband +ent-LPPArmbandBlue = Blue armband .desc = Blue armband. The color of this armband is said to make some officers twitch. -ent-LPPArmbandYellow = yellow armband +ent-LPPArmbandYellow = Yellow armband .desc = Yellow armband, reflecting affiliation with a certain patrol group. ent-LPPArmbandPurple = Magenta armband .desc = Magenta armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. From 3452864d26e11bcce70f9df90176d5d13819bd05 Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sun, 27 Oct 2024 16:24:57 +0700 Subject: [PATCH 22/23] Update Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../prototypes/_lostparadise/catalog/fills/boxes/security.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl index 2fc8676dc88..8dcc339b9e0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl @@ -1,2 +1,2 @@ -ent-LPPBoxArmband = armband box +ent-LPPBoxArmband = Armband box .desc = A box of armbands. \ No newline at end of file From 8e6834c608d61ecf8b68deb4a0da2950480d0f2f Mon Sep 17 00:00:00 2001 From: NeLepus Date: Sun, 27 Oct 2024 16:42:07 +0700 Subject: [PATCH 23/23] Fixed en-US translations --- .../_lostparadise/catalog/fills/boxes/security.ftl | 2 +- .../entities/clothing/uniforms/armbands.ftl | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl index 8dcc339b9e0..2fc8676dc88 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/boxes/security.ftl @@ -1,2 +1,2 @@ -ent-LPPBoxArmband = Armband box +ent-LPPBoxArmband = armband box .desc = A box of armbands. \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl index f03ad1d09a3..132c0f9bf1a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/armbands.ftl @@ -1,12 +1,12 @@ -ent-LPPArmbandRed = Red armband +ent-LPPArmbandRed = red armband .desc = A red armband. Smells like blood. I guess. -ent-LPPArmbandGreen = Green armband +ent-LPPArmbandGreen = green armband .desc = Green armband, reflecting affiliation with a specific patrol group. -ent-LPPArmbandBlue = Blue armband +ent-LPPArmbandBlue = blue armband .desc = Blue armband. The color of this armband is said to make some officers twitch. -ent-LPPArmbandYellow = Yellow armband +ent-LPPArmbandYellow = yellow armband .desc = Yellow armband, reflecting affiliation with a certain patrol group. -ent-LPPArmbandPurple = Magenta armband - .desc = Magenta armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. -ent-LPPArmbandWhite = White armband +ent-LPPArmbandPurple = purple armband + .desc = Purple armband, reflecting affiliation with a specific patrol group. Wearing this armband in combination with the red uniform is officially recognized as a violation of Article 106 of the current Corporation Law. +ent-LPPArmbandWhite = white armband .desc = White armband, reflecting affiliation with a specific patrol group. \ No newline at end of file