From b6d82c91869eea6405c1a221ba83189734da17de Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 23 Apr 2020 17:07:31 +0200 Subject: [PATCH] Import TG armor vest. --- .../Entities/Items/Clothing/OuterClothing.yml | 26 -------------- .../Entities/Items/Clothing/outer/armor.yml | 32 ++++++++++++++++++ .../armor-equipped-OUTERCLOTHING.png | Bin 0 -> 343 bytes .../OuterClothing/armor.rsi/armor.png | Bin 0 -> 252 bytes .../armoralt-equipped-OUTERCLOTHING.png | Bin 0 -> 295 bytes .../OuterClothing/armor.rsi/armoralt.png | Bin 0 -> 192 bytes .../armor.rsi/equipped-OUTERCLOTHING.png | Bin 773 -> 0 bytes .../Clothing/OuterClothing/armor.rsi/icon.png | Bin 287 -> 0 bytes .../OuterClothing/armor.rsi/inhand-left.png | Bin 288 -> 286 bytes .../OuterClothing/armor.rsi/inhand-right.png | Bin 314 -> 291 bytes .../OuterClothing/armor.rsi/meta.json | 2 +- .../armorsec.rsi/equipped-OUTERCLOTHING.png | Bin 646 -> 0 bytes .../OuterClothing/armorsec.rsi/icon.png | Bin 291 -> 0 bytes .../armorsec.rsi/inhand-left.png | Bin 284 -> 0 bytes .../armorsec.rsi/inhand-right.png | Bin 294 -> 0 bytes .../OuterClothing/armorsec.rsi/meta.json | 1 - 16 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml create mode 100644 Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png create mode 100644 Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armor.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armor.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armorsec.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/armorsec.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml index 14fd4cd485..63c4c47083 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml @@ -63,32 +63,6 @@ - type: Clothing sprite: Clothing/OuterClothing/apronchef.rsi -- type: entity - parent: OuterclothingBase - id: OuterclothingArmor - name: Armor - description: '' - components: - - type: Sprite - sprite: Clothing/OuterClothing/armor.rsi - - type: Icon - sprite: Clothing/OuterClothing/armor.rsi - - type: Clothing - sprite: Clothing/OuterClothing/armor.rsi - -- type: entity - parent: OuterclothingBase - id: OuterclothingArmorsec - name: Security armor - description: '' - components: - - type: Sprite - sprite: Clothing/OuterClothing/armorsec.rsi - - type: Icon - sprite: Clothing/OuterClothing/armorsec.rsi - - type: Clothing - sprite: Clothing/OuterClothing/armorsec.rsi - - type: entity parent: OuterclothingBase id: OuterclothingArmorreflec diff --git a/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml b/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml new file mode 100644 index 0000000000..cc6727e1be --- /dev/null +++ b/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml @@ -0,0 +1,32 @@ +- type: entity + parent: OuterclothingBase + id: OuterclothingArmorVest + name: armor vest + description: "A slim Type I armored vest that provides decent protection against most types of damage." + components: + - type: Sprite + sprite: Clothing/OuterClothing/armor.rsi + state: armoralt + + - type: Icon + sprite: Clothing/OuterClothing/armor.rsi + state: armoralt + + - type: Clothing + sprite: Clothing/OuterClothing/armor.rsi + ClothingPrefix: armoralt + HeldPrefix: armor + +- type: entity + parent: OuterclothingArmorVest + id: OuterclothingArmorVestAlt + description: "A Type I armored vest that provides decent protection against most types of damage." + components: + - type: Sprite + state: armor + + - type: Icon + state: armor + + - type: Clothing + ClothingPrefix: armor diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..427c203b198f8124ab283106ea28c080a1f0a726 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0F7RE~%`frm3lEWoc() zW$)gpOC6c!p98XguE85x#{krJD zx|QZqEguv$zDfPKpta%YOtzKZH_8~CSmAqivI}3w=}Dpr&;Hqe{ki$YZPtYIuVxFM zSmmskuE3tWfV;tweU55`O~Z+KDm!+pVLrje*<{Q$BfUYSBS+QowGpe@fjiz0k`tDE nWAIb)kTAHLx=*LJZnCuLTB}gTe~DWM4fF4cgj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png new file mode 100644 index 0000000000000000000000000000000000000000..e70741f1ff9e9d7153845eb7c8e05692c367083c GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na*S0D`p{QUf4Vq$V~a*hrT zuCA_ufq|i+p^=f1d3kv?H8nR#)Gy6%rOm1lR252!`qpi6tS`;Zcp&29(j{9KIWr`7xEx;g34e;g?>}&7kGs qSR~<{m60)nxrk#Y!$F5*0?Z7Po*TSeY_(?_$P=EfelF{r5}E)iDohIi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3019268737e8eda0026c3ed366dcf8d791bc4834 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=>VS)S0F7RE~%)Xq^zW-uV-j( zX5r-M5)vGcmYQhXy_ORw%~%rT7tG-B>_!@pv&+-PF~sBe+bM=zOojrk|Bt!ewsqo2 z%udu7IAo#zfx)pYK{KqHd42Be{fENDlz!gzmNV8o#9p;;7R!=p+yNd2JtYAu8y9$H zHial3%eg8Xp0+&9cw>fI;@01jTcRR6(iT3AGhCQHxzsnSmw3+#K?=Ikg;lUiv0;Km0@zet0AW^Qe6eKEBiC!D@XMEr=k$i*yR n{GIgxE2Dd>K+S)f{nO3Wq7`aejY=*7eZk=A>gTe~DWM4fyf9{# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/armoralt.png new file mode 100644 index 0000000000000000000000000000000000000000..a91a8b554f8c9ebc160e33c74a8c6cb8eb724c21 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0F7RE~&3)=;Y`U5*(10 zn%LFgaRn&KSQ6wH%;50sMjDV43F^ww*?ee<&SADDV*W1MpL+HFQpr#R`DEjTNXQ*_jD z-NlTwPshdco?q{fobi07`sDIQ7U#Y_m$EaOzk)X)nR$VkLoaW`Ee2CFhAieQHyA*I zA`bN?9`BFyXU5(B`$O?08 zvm3~tlR5YEX4&=9#$vwD56>7HI;{P_vuCCOkFjTaB1fRe)R(J7N?%RqQs`3RIBf9w z?<|)3)~hU8b}jKB%lDQxoF=JMJFC@(I%cYRG6kLLmg`;-!ZO{T+ns~4$I!v0Aa=V~dDM<|+#MV}h5}9! z{6A)RG2XGeA6xtC`rCz{j5<0V{I+9YcvH4})m_m=CN=lj=Q0bsX0R9hS;M$T{E$VT zwzQ#Y-(w#}8sUnrq$Yh;a1(Cn zt4#<1bzLXhCDZBsx002ovPDHLkV1hx~bz%Sj diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png index b5d674612ee674fed5f382fd0c3559d21ff9f1ca..aea0f39676c9a3df42501063df31031b33721268 100644 GIT binary patch delta 271 zcmZ3$G>>V5L_G^L0|P^Zd(K-RB@y5g;tHfSH8mX_9D)J^LqkI&BO?&v6Xy0jT<2JSLr09Cm$O|%N3Iw!;OO75e~wg^!JF0KWJZU;3aRxM>^UU;d=Mwo+f$t5Pfgr&??nT+f@ zOPOwXakFp~iaY4)-nl5!vWSDho4bTnPlKuFq23FwQ`{S;ixo74Y49v_Vq(~@B5sqS T>lp_000W1otDnm{r-UW|&u~@D delta 273 zcmV+s0q*{u0-yqr7=H)`00020X>r~F008GnL_t(|obB4NZNxAPh2fVVooDa>0I-+yd>dEinQdGJ9S7)Af`7rn+(v);0T=)tDFTcz z2PRJW6wyR8Y9^r_=U1DuJ|GLEvKsu%0jGDLvNy-w;(SQ}ENp<--=}nvl6?n|SU+La ziUlQLi~lB+`|;^IQD*@u*r`%J(2bX&a*lYtpv~*uBj`+eV0J*Av a@C0#A7e40000r~F0099>L_t(|obB2%ii9u}#_{K}cmXR5N&O(# z$Psc{uMsehBBH9< zd!JvOX^SoSzvnhX2;!U*5y{RuY1{Ukq$k;u|7+<+N=dA>l7CV#RBjM6lX#28o4 z%{Jh-dyDIL=bV#a7#`PJ{$g%ZRkOABu?`_f*LAaJ-_ia1f3}o=v8d;Vd{XfM00000 z00000z`;~C&&}XI&90fBF(&tYU;Ksn;o|=RYx=$~L~cdbbuDFC9-HbyyBct3jLB71 x$uvzz<+<_9zvUHEy?D%k)4002ovPDHLkV1jwciTMBk diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json index 117a2241ce..1f4418b05a 100644 --- a/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "armor", "directions": 1, "delays": [[1.0]]}, {"name": "armor-equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "armoralt", "directions": 1, "delays": [[1.0]]}, {"name": "armoralt-equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index ae61f2fd078fb78801ffe8c699ffabfa9f062014..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVDj~JaSW-L^LCb^|C0cb*7E`Z z9xPK$ML%;JoS$TMCB;BxvBB(;|6H6Z$pNzyc1fD{C1n3#RX!FX))>*~WOL-%xiV|r zFMDTxQ~6TI*>s)fc|q0v>c(pK`aCY4natZ5&7>G^Gf49`Cee5~ZoKZYUq>YrW`PP|`x;!62FrqqY8qPFVnPPqT8c|Y6SyvAjF z)mai-^zs`OdZfNrPFuU@%iQe^GA^aBYd2OzLj0jSL2uvS$7R z*>(>9*#EzNlm7fOL+*rcHTruU1(_Nw{@-qWnQXAAueN02o?VBpp39lIUa%!FU(~RA z-_}Ku&yPNB-NFY7$#1_lz1-t*Q_}bz2lL(V<~^l9pDtBZe>nT+6}kCywtc&3#b7-D zR@Uv6>*DMG*4@iwFjD(`)5l@%b+tX`8vY;2l3H53Vg1aOgYnJx7`Mz6f6*M9E>yOz z!R|TJt_$Dxv9`QA;}E~y;j)cW`t}3muKbR8y!Ml!FVdQ&MBb@ E08|nv4FCWD diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png deleted file mode 100644 index dda25f475d3cfaa4fc4ce4a9c8996adff5e1eaa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJSDr48Ar*6y|J?ZBl&HXXx#5=G ztA;@K9;*Zos{^&E@9Kk&tbE4sed^Bt>6_pEJAdH70fG7=p{`Vee>vCg{`V~9;MVMt zl#q~cO8O&lP3Ptjf%6RoN4nX!O9BNvOuI_hWh{&49z5nY+0n^y>cgYWw+jk6SwnZ& ztZbM#<h+azLhc!O35aJTuHx$xD+H~_Uj zdE-&U@xUwNiHZXon~?Crvs*U&=K+E{haO23#oyo8Vxf{P>e)F#h5Z5(&s-M^s7J0a fF6LVx%D`YZ!*_n%+nG&3Uo&{R`njxgN@xNAufcYA diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-left.png deleted file mode 100644 index 13ba70d9c309d0457741302c99d0874335742573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k3C%+Ln`LHy=BPPWFT_v8&8;Au! zvf=;Zs1MGc9cL|0E?^c}$7;XxS!SsDHfz^SK4HzP6mHZUkgzkf{%~3Uz>KhaKmRi_ b%-Eq_y4mH_xpiLcAVWM|{an^LB{Ts5op*X9 diff --git a/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/armorsec.rsi/inhand-right.png deleted file mode 100644 index 13bc4252f37c2d81725e6babbe6adee5b28a184b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#`WcLn`LHy|t0I$wB1U$K{0_ zUQ%3UJ07)dP~2F^?5)kVVNnXRj*d=`am0?s*50MjHqwR**bTd09R07aSRmf@{z2*c zPM|>`@I$>hpZ&*_k1AI`Rc?+lnOFSc)|pREy`CjDo>ynMY~B-ay?VdaX>Qy3eL-=# zKi$`z{aU2$DABofGS(2K&o?=>R%n+#U{ zExrGV8DbBR+`r^j{rAY^@*TZ~ol(;FpK