From 1f3f1d7d972bfd7671a5023779198e0ab776f813 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 30 Mar 2024 21:01:28 -0500 Subject: [PATCH] Removes SCAF armor (#26566) * removes scaf armor * replace maint loot spawner spot with basic helmet --- .../Entities/Clothing/Head/helmets.yml | 23 ---------------- .../Entities/Clothing/OuterClothing/armor.yml | 26 ------------------ .../Markers/Spawners/Random/maintenance.yml | 2 +- .../Head/Helmets/scaf.rsi/equipped-HELMET.png | Bin 890 -> 0 bytes .../Clothing/Head/Helmets/scaf.rsi/icon.png | Bin 569 -> 0 bytes .../Head/Helmets/scaf.rsi/inhand-left.png | Bin 753 -> 0 bytes .../Head/Helmets/scaf.rsi/inhand-right.png | Bin 774 -> 0 bytes .../Clothing/Head/Helmets/scaf.rsi/meta.json | 26 ------------------ .../Armor/scaf.rsi/equipped-OUTERCLOTHING.png | Bin 1487 -> 0 bytes .../OuterClothing/Armor/scaf.rsi/icon.png | Bin 667 -> 0 bytes .../Armor/scaf.rsi/inhand-left.png | Bin 691 -> 0 bytes .../Armor/scaf.rsi/inhand-right.png | Bin 680 -> 0 bytes .../OuterClothing/Armor/scaf.rsi/meta.json | 26 ------------------ Resources/migration.yml | 5 ++++ 14 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 48aa43fa55..2c5cb54094 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -147,29 +147,6 @@ Piercing: 0.9 Heat: 0.9 -#SCAF Helmet -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHelmetScaf - name: scaf helmet - description: A robust, strong helmet. - components: - - type: Sprite - sprite: Clothing/Head/Helmets/scaf.rsi - - type: Clothing - sprite: Clothing/Head/Helmets/scaf.rsi - - type: IngestionBlocker - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.8 - - type: Tag - tags: - - HidesHair - - WhitelistChameleon - #Space Ninja Helmet - type: entity parent: ClothingHeadEVAHelmetBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index fdaee45ccc..9a1f142740 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -183,32 +183,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Armor/magusred.rsi -- type: entity - parent: ClothingOuterBaseLarge - id: ClothingOuterArmorScaf - name: scaf suit - description: A green and brown tactical suit for combat situations. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Armor/scaf.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Armor/scaf.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.4 - Heat: 0.9 - Caustic: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.8 - - type: GroupExamine - - type: Tag - tags: - - Hardsuit - - WhitelistChameleon - - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorCaptainCarapace diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index df61726a99..450b501d1a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -77,7 +77,7 @@ - ClothingHeadHatCone - ClothingNeckBling - ClothingHeadHelmetCosmonaut - - ClothingHeadHelmetScaf + - ClothingHeadHelmetBasic - ClothingShoeSlippersDuck - ClothingUnderSocksBee - ClothingUnderSocksCoder diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png deleted file mode 100644 index ec1c408550ddbd67c5dce0f1b60bc6193fd5275a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV0QF$aSW-L^LEzxY+*-{>@u?EHH>ssvg1t2TzL_}|RJFEkJ;*Z@| ztr$FxiyJktpMO8UCw8{43$yt{ozINw(j}(_`t(a!q@JqT$(LQ+bU68X$!hIQQ$%`; zgk2f#u)KB$opOD_ZQKqg)L8#czcVCCsa*1opST; z@{hshXR{l9#Jofu58V9Xnsl@F$#?&P_y4{w-17X4+Mr-E5+ zPZeWCoYay(?ftNQ81tNKf3{xwy)bNN z?G4xSZx)1da&LXP#OT1L-!G7_dUj(yHXcKtlb@XVbkFm zhDWb|d26^r)awG5>Y5|{chpd`QdN$<;Y!Mk>7BP91Eb~ROCE(EmW=Onnj|l(&GQKSOiY-fh5oZk(jSE5KX>Rg T#`x_4<|zhGS3j3^P6=G`P)3`CH9;`SSPy~(>A?;iym;smbn6#Hf1rbS3PFnKAW{h7sXx(Ah#>3|vA0+P zp*C2A4lcVJ3W2q;9dy=l%h_2gjPSiU&Wzvt%=dlH2=#g$lhn*a-KPLkfWH7B@@}lu ziVn}dkRCzlxGeC-75wf2VjN2?a0N6~D-Z;;1eIFRiKP~}%uUsTsagPlH|Yh{y+f{y zjm!WsUtL;c22eD^HKrBPBhWiGPEL=QnPB!n=cbG6nGf+A%3;BH63CEMLbD7=`9bEP--tcB&lxZ7&F=2w>w{n=S&?1^7Qz5wBP zGH_5uGky-B+iG$J;@#&JR}YAC!>zq2H{6D#%@gT1LV5(I+6F-X8@|zm)xAS!dnW;) z3*Z(2pkxi)%YzfYqu2TC8)+z-fk(INd!OIBhyYOC47bBg^$xKteM`pOy3a4a0sx*L z+1<|tpm%J{OM~yGYC-9PkTJbRM9lq8?+fsiOx61IIC;%^jEQ`o<6>doA!#Kd4-GvZ zV ztd}BQN|8{ZS;0#$i@U<2U?WTqn=x+OWYwL;U3?!9f9)IJeCNFx+4lf~AP9mW2!bF8 zf*_WSfYSjaNfO}3{A4m2NA^K6ZkRbaJ!1T|Dr*3M!~N3KVsm?LJFERH2#42vO+0z=7pkmT=5sNZXRqF+EGNzPf_OSMkqVyN1Oa2xv!LihRL?K*`px5!2;-Yz zJRO57YnIXF1YrV%ln9Up5~~;J)PbGtn~?wZeFcft3ji_Wx_idpA^-r^6DBbX+o33z z0SGtDG@ZsfP#y(ry_=k`ZnX2v14$r3mV2IGF^w6sG&~1f|F@nVq70)5jLVD<-H+xcq9x8-}^uH*cf;4D@hhPnYcxa{nMMK+54;Il& zkz6IT2UqB&q%2tjqOeie9yYVx?XESrYhAPN2LrM=KkVQGOxB4LY=S+S~r)$HNBkFRC+S>$^FfTM#lXX%&zBTPTj4oud+VmA5VW(aJ= zlTidC0hF?N*=zx)q1Df{|4aXh+2m%uqZ=aMgFohVya`Od8KdyfRKIQuhEF)s?0 zj3cw4l+DZWWE6lBxHfoJ3(T_Ev;6uhbPmX*b20#g{l>%=`byyCYEh@(a1hF*bMp3+dxrGs)&_>j zfU^vk1;aU@TrG0l+5lJGHFZo1{w`oz1n+9FW*9QSZIA(r7O-esZva6M1VIo4K@bE% z5bk5@%g<%MKQN7nt+Cs}dWFGAKz;V&*{h{_t8B@DQZ_FKV@lxKwluq-unb1bYyfMc zF|^%SX2y*XjyA#a7BK6;HZ{+j&P)bm(m8o!`x^Zgpxpw^dI!IDo`ZY(008iY+u*)@ zO4ufL9$3l%p+Clm9|8c{xM{KPXzmuI9$VEncPwuK!-8ku0Vwwi3YGVcuK_bPM#|M9 z=Mj7e`&V@x(vK82QK;(NkIw*5aKM2{<8aq5W z<~)K=&4g}kurwDdZL0x)U!7SNT;Cie0~Re{(YW4#-)#mij&_gLvH$=807*qoM6N<$ Eg2Gc?oB#j- diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json deleted file mode 100644 index e0ee93d642..0000000000 --- a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index e93c024893a80e649601e9a3b17bd37bd7d10537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1487 zcmV;=1u*)FP)1XK-V7#%hG7Rr#J7-Jk5Kq z#t&tD%J_`80K73)0B-?!W2^w)0`SII0lWp^4L5DWZ+`n)1AsSc?_74;*a7L^3as2z z7LXQGS|Yh%oDXUP0Ey(nz&3V3`kanUVLCR2L~_A6$TchZ27$@~T7rtqVF`(?1)QE- zAT6e}gOq4!IxVKOmY^b$TtMcqgqEPP$iReZz6Jm|ZU5SZizXC)<@#RB6)I4&P5755 zP|erik$uMfmY`xfHf7vjip=0U?Z*dmgKqw%$V^Y0?)$X-_qqV_yQRnsT7n8C+r)Hi z3M*T4#z9`bC8&mQH2zA1e*C#YrRNxypUMStg$mU*tLt{a(kCmwr3JkFkkVc(K1T4e ziE6%vy5t?`-z`B!UGk!uuOWEZ#EZqpc=^HJWH<_bs#PE!3v~E=wQB-0|M$o~#A5-P zZmH3aU&%I&!wx@n96(T)yb%0uRMAN)D>tlNF+=dXAxq@EQzmks6_!t|CF1~qe+qvg z9MYSILuhN*q~%56Jl{aEjCMO1fw6R zI4l)FmXu$QuMyptgd#Tqz)%7~(G*Hd$EF}1Un7xhuhllDK@#27rEC3#Wb;V(=MP3d zqAq!jXYT{G(@4kH5d3b#!~uO2&hri9TCuFRdnic9?H7l)J@@pEzAnd|6%cD7s|I$g zIqr=Fcdxd!YQBc(qr2Ia_!vE#% zhKLg*J!*cY$bpP>vCC_^XJx101V6O}?5&Ef`qK&2pH849s7B-`D>r%^-oEFQRXD}Z zWC2Q6j|1w8x8r(U^1{=O5nv3$2Xlz&k$pyt!pcv*3jAO3$?pn}6~J2n-WV%@ zw*b5`Rse4Scw?*p-U9H(SOL5R;0@-DbaVRIoFV23J2Ej@!215C))G|smnX2YHRnhj z04vgBN?X~QgMV57OeTAXv|x4tkL*J=U&HCi1$QNomp?tZ=tn4l$D7HWb_=5Lel-aIkU1hiv2Gn%JGKhES$pUD>F-^AbWJr0@mRo+i#1Edv@4tzQ<{Hy0zl_Tm~(SSXAQ@e z!nByuNFI{BJeh+?I$X&%nfRG4pkK{^IWyzrq}UQvoagm(k{#-!^Lt8*cO#mkh ps#jpaxITcl0K73)0B-?!<3Eg!FlCpy$bS8ZIOuiNO;WaSt7Gc+jOJQy|UKv1_;d6&cz+V5ALau_UC9!4eiGzduzGKT4 zs+OdXt6&!N|Zvb!u(cj@8pS3Hw{3P)D;!?>Pe!3hm{uYLYT@30quBJ+_x}fKVbV%Oq+396 z2>M~@LFD;48hD-7%=>Y>@+Xkh(g6G_{bYT)W4^vjH^ROsQ*cvkQLfUpgQfTyOYt@E z;Wd)L7yUc%C~<%=v#UaXnQJGCkqUftK1&~dymuB7e@MK1oZUCY z))U*b5+SX0>huST>r$QLjT6a_fUg3_8z<6f_RP~!T8Z>zFIRc8>`t?1l8AF50{?=m zz~FllOm!eR+Rh6_ISOMXA~(|Vz+Gl=Rg42+1&+4!lCc@W*bHIIRxk6_%=^wh(5)L+ zm9Z2suR3|aFoT|QLk|+@<_LTe&mg4P-SEFB@D~W0__-qyB^dw!002ovPDHLkV1kcE BHk$wd diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png deleted file mode 100644 index ce718ad3009dccde289173a2e65180ea65f811c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 zcmV;k0!;mhP)Vr7Mmm`QAe~GQF2&f|-cY*x3J}uW;PFM7w%KGl zH3cbv2oAY<53LD!@p2IWGae$hFhjr`Cb&77Ce8KDZPQJ|PP4&+B+FXRAlWPDjujsoTom^9!i|FhwFoIpc zb}W@!n4##_SxilIub;mE9Oz4KJzr6;UnTyE-^rIb{PsnAf3@!dy@TwXwu5eCy@TwH zAI0Ed1PK7Ir6<_jdh3RC1kMDo@sveD`GBj$oW2yL3gvLP& z;9h430-1o0w%KIzyhX-{c1!TX3SzN0w~=4qH)mjoq#~j0HAyFWb)kq;32>XfIsI5?jx`XXq(Nxa|lBC Z^BcM)3w1J!rL+J5002ovPDHLkV1mIOQ#Akp diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png deleted file mode 100644 index 6bfef738a454fd7a42912bc9b1233628db04c081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmV;Z0$2TsP)ho@Oe_jsthXFm1!2R%dQj-8z3ke5r2jzAz4`|fwnKB+NwD=$ zdU0OXrc69ckQjqdkhWxp5Xmno%d{l;d@do$8+hJ__e}!N0}w(8A%qY@2qA!N)^}SSnIWLs!-ywTuTFl7hQub;;rXpYe7KH@8m!fc^lsgf1zcP;Bb}at zcfY4dC&OKQ^t}Zp?I{Ymb@T^Vy%k^zTi<{e--Ul`-@w^