From 14ba764eb53773345688245f6c1895d13ae90f7c Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 18 Nov 2023 02:14:56 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=96=D0=B8=D0=BB=D0=B5=D1=82=20=D1=88?= =?UTF-8?q?=D0=B0=D1=85=D0=B8=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OuterClothing/Armor/blueshield_armor.ftl | 3 + .../OuterClothing/clothing_shahid.yml | 52 ++++++++++++++++++ .../ShahidBelt.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1128 bytes .../OuterClothing/Fun/ShahidBelt.rsi/icon.png | Bin 0 -> 479 bytes .../Fun/ShahidBelt.rsi/inhand-left.png | Bin 0 -> 658 bytes .../Fun/ShahidBelt.rsi/inhand-right.png | Bin 0 -> 665 bytes .../Fun/ShahidBelt.rsi/meta.json | 26 +++++++++ 7 files changed, 81 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl index bd54ec62889..b00a0b369b7 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl @@ -3,3 +3,6 @@ ent-ADTClothingBlueshieldArmor = бронежилет офицера "Синег ent-ADTClothingHungerGamesArmorCapitols = Броня Капитолия .desc = Броня компании "Космических Голодных Игр". + +ent-ADTOuterClothingShahid = Жилет Шахида + .desc = Набит взрывчаткой diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml new file mode 100644 index 00000000000..09a12107d52 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml @@ -0,0 +1,52 @@ +- type: entity + parent: ClothingOuterBase + id: ADTOuterClothingShahid + name: ShahidBelt + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.8 + Piercing: 0.6 + Heat: 0.9 + - type: Storage + maxItemSize: Small + maxTotalWeight: 2 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + # to prevent bag open/honk spam + - type: UseDelay + delay: 0.5 + - type: StorageFill + contents: + - id: RemoteSignaller + - type: TriggerOnSignal + - type: DeviceLinkSink + ports: + - Trigger + - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. + explosionType: DemolitionCharge + totalIntensity: 80 + intensitySlope: 5 + maxIntensity: 30 + canCreateVacuum: false + - type: ExplodeOnTrigger + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:ExplodeBehavior + diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..bc431410c92043ff8f01a04667e1ea1077f33791 GIT binary patch literal 1128 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=j6naSW+od>du!A>$|_w^!lg zpOrjKOLiuR8)Rr}lr`PpzIM#XTH0~K1Sg%Il`NK*HRUpoLeCkQX3pFlt@woZ%-*>(x4-{=uiSX^hRt4{f~+o#fes=9FzVl`10OzY zaO*9q$<#Tuf7ZTp=lt&8zAfEpZ(y*%@SXJbi(lCo;$vequdFzfe04%cSNeCwyz=tx zTsp5NyENC`y>@NcsmK1u-dL2~j%4r?VEpy__xy%}-IFZLGE8$-BDAKy;CEOgD=TX? z)hn=7WBT;zChw$w_rB)!(3|Nq$$DLNRh5(A1vW>K8=pTH@9KNaUJ)A`n^+-i|E6S5 zftZ5FD#l>`1bx+ts;XNLI^I5Q+wtRiV}I1jhV-QySJb6578na1x9`z3x3XHr#?F5A ze?57! z^WUvIKD*z2PYFu4JahJJ;^akA?3`!pLLM;d&-KW7V|$-z_vX#ce~%_@T&3P9eE;Xq zO0ReB-rP55GDvXN>qT=ks+sOae8zU<>Gt{l5^Eba8sBl;r$&ame+B_}7x{kZ3{ zQP7YxVzNg}zk~4kBjy_)ewO;7CcaY)mLO1*2ZHxte(-_cYYqIGExbRk)rsree=Rz) zV8h0lll9rx9}e6z>6l=p-gM=M1$O6;UwOK?_^o$C=k6#K`41d-Kb}2s^QPp-gMpG3 zzvc*7&*w2zQa_*j=kp2;1>y2U9^vVRxp{Z~Px>l!U{0CL7t_hIBw-`x!Si2MJ~yrJ zNld!M)UcSJ{kdvEN&SDF>D}GkZI>P^%T5rJlgp5KyMyaEo7gq0TMrT*yB2P(-SJk( z;qs3ir_wgp#AjH3ymNx%tLfP@Ey-W^IlL*cS}W1L(O2e;-~%b|jnf$%Hpm%%HEjDT z&b>iUMB>1$TelYNJs`2@v_{`Hf8ShThLjlrzK*MR%w#opHQyO37?g*aIe)Ad`N1m{ p#5wsvmP946oZw51@J#ddWzYh$Ie-`hE(K2pQJ$`TF6*2UngGX*{kZ@D literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..be34cb26903f8289983e057b3e9cece5fb3e4026 GIT binary patch literal 479 zcmV<50U-W~P)-+ReqZ4!;(RMtRL^@4ypZ}RiV92r z+Al25Y>Ejuj-$#zkhg8SP@xQFZYd^!=1jnK-5dzVoX;VY1dk>8G>zt#W$75}PN$QS zK-_FLbq@Y`Jf`Q$7GeTP(;DOj*e!s=;ZQ3B&E~}fa0tM7!-NP81_SDLyR_YIDGWo3 z<2c**|JUtyTWvNQ6$F9W?RM&|URO|LZdnSSV=|d2)ZnRtE*`?sXhfdpQENJ-;c!S_ z*Q-`zf4S(lZ_VdAMqL#Xe}b3UjG{(^-p^-!8}K*4JbeE6kAw&ebyZBP!2Wd7eV@nU z)MFlAlX$gS(Np4=%O!E0l!SO^*Yy=uO4qgkzTJyi^W3RS6s*-7`)%Whyh;p z3ZkcY2ABXmz}Og^W8;kiMggP1-6`-5Cn}`!jh##|0000EWmrjOO-%qQ0000800000 V0002eQAn7L%huo4J~V za#ATrR=#l3;#w|g>3D~rn>QjkHEUQ8cDz@3V(28*y~OYtV@?gTzH3YG|A`Y%SH61p zl*i>C>&?46XWsm4|9#!fz^+~vj|Ln_fvd4-=Nj4L7Z2Vrh`yknBWJ3obKNdF>Av&j z^u2NZ;#{nuYs0oXC2SW>e!YL|idIE2hOZYrbj7$sSB8YFzItm;Q`O#e#~*LZ+J5_3 zw9v<+Nr8%SOh@%T@AwtLuxCw}T*Ie=7hf#|H{bMO_Sk$gj?+ugMIY6YwIL`3!nS zeS1$8?YwfSZuhj0Pgktmu$n)7<}bIKHbuMFt$re|+HU{sko`?lyJZVvv)gVy?b;Kz zTJwtRk&Aru7^FXLH^1&~|4)GT&u`8WOD#92wV!D45B<;{an^LB{Ts5 Dk3kjD literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d77f2cf7ab33468ce5fef8848c7cd3b1fca5771f GIT binary patch literal 665 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~=BS-ysK?WBeu& zoQYW;4Rep)U@g0@=aX}!v$ePLNMpEy<00z_KO~N|I*K1*Pe@E!$~P%wU-$Jn0bbr~ z%zl_^mVbZ$_1*8f^3-u z=}TQ~*JXcWP2gi&bTfxbV&2&_y)c<$Yaa$MRm83TYA6)0FT$lKwkBw0N76=(y)HtP zvrq0&Fgua<)O`JPE{`RQ^&5>#%B^I}?dI?1-#O>X|0(CItu3dBeC>UmdZ|}C`N!n8 z#GL=X&ocR`33IyG+W!=4d(Y#%&Zg|pN$GFKKk|EjA57@M=~GAu)Je{=dKAwFsH>8D1j()B-> zIWE8avY^kyn&DZ=E)R!qziVf@eYXw}Z2v#|_38`rXRRxpKkWiTf}C36Y9GTh<-70Z zv#S;CV5voen+HZbyf9-rvcJhNT%?zHlVwM}CT6JGo6yuNBwC`$rS)9=`_qj!3=D literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/meta.json new file mode 100644 index 00000000000..3ff352fdab7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Fun/ShahidBelt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:shi106", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From f7fcee4df676590323155b3f972f61626e28a165 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 18 Nov 2023 21:09:16 +0300 Subject: [PATCH 2/4] fix yml and flt --- .../ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl | 4 ++-- .../Entities/Clothing/OuterClothing/clothing_shahid.yml | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl index b00a0b369b7..cdd00ca64fc 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.ftl @@ -4,5 +4,5 @@ ent-ADTClothingBlueshieldArmor = бронежилет офицера "Синег ent-ADTClothingHungerGamesArmorCapitols = Броня Капитолия .desc = Броня компании "Космических Голодных Игр". -ent-ADTOuterClothingShahid = Жилет Шахида - .desc = Набит взрывчаткой +ent-ADTOuterClothingShahid = Жилет со взрывчаткой + .desc = Бронижелет укреплённый вставными керамическими пластинами, полностью набитый взрывчаткой и различными проводами. Можно привязать передатчик сигналов. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml index 09a12107d52..c065a4b69e5 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml @@ -16,11 +16,15 @@ Heat: 0.9 - type: Storage maxItemSize: Small - maxTotalWeight: 2 + maxTotalWeight: 4 - type: ContainerContainer containers: storagebase: !type:Container ents: [] + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface # to prevent bag open/honk spam - type: UseDelay delay: 0.5 @@ -34,7 +38,7 @@ - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. explosionType: DemolitionCharge totalIntensity: 80 - intensitySlope: 5 + intensitySlope: 7 maxIntensity: 30 canCreateVacuum: false - type: ExplodeOnTrigger From 94d6ea6c47699205f624696c2fb744975e9a0f73 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 18 Nov 2023 21:25:16 +0300 Subject: [PATCH 3/4] Fixxx --- .../ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml index c065a4b69e5..d53655aad65 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml @@ -48,7 +48,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 400 + damage: 500 behaviors: - !type:DoActsBehavior acts: ["Destruction"] From 89031efc9791d4fb4958a3357b2d7181b9d2c7fe Mon Sep 17 00:00:00 2001 From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 18 Nov 2023 22:19:25 +0300 Subject: [PATCH 4/4] Update clothing_shahid.yml --- .../ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml index d53655aad65..bf98c31e119 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml @@ -1,3 +1,4 @@ +## Бронижилет с возможностью подрыва - type: entity parent: ClothingOuterBase id: ADTOuterClothingShahid