From 3499f4265b78d353d1ca9201450d8f026054fc99 Mon Sep 17 00:00:00 2001 From: OctoRocket <88291550+OctoRocket@users.noreply.github.com> Date: Sat, 27 May 2023 04:09:32 -0500 Subject: [PATCH] [Add] Adds CentCom scarf (#16832) Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Inventories/winterdrobe.yml | 2 ++ .../Entities/Clothing/Neck/scarfs.yml | 11 ++++++++ .../Neck/Scarfs/centcom.rsi/equipped-NECK.png | Bin 0 -> 565 bytes .../Clothing/Neck/Scarfs/centcom.rsi/icon.png | Bin 0 -> 284 bytes .../Neck/Scarfs/centcom.rsi/inhand-left.png | Bin 0 -> 528 bytes .../Neck/Scarfs/centcom.rsi/inhand-right.png | Bin 0 -> 548 bytes .../Neck/Scarfs/centcom.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 39 insertions(+) create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 8da79c7558..ac39db6d8e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -13,7 +13,9 @@ ClothingOuterCoatBomber: 3 ClothingHeadHatSantahat: 2 ClothingHeadHatXmasCrown: 2 + ClothingNeckScarfStripedCentcom: 1 emaggedInventory: ClothingNeckScarfStripedSyndieGreen: 3 ClothingNeckScarfStripedSyndieRed: 3 + ClothingNeckScarfStripedCentcom: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index edc89d9feb..33f582d30d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -108,6 +108,17 @@ - type: Clothing sprite: Clothing/Neck/Scarfs/syndiered.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckScarfStripedCentcom + name: striped CentCom scarf + description: A stylish striped centcom colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. + components: + - type: Sprite + sprite: Clothing/Neck/Scarfs/centcom.rsi + - type: Clothing + sprite: Clothing/Neck/Scarfs/centcom.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckScarfStripedZebra diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..63f1748aa1c71f2271af39beaf7459fd6a711d87 GIT binary patch literal 565 zcmV-50?Pe~P)Px$?@2^KRCt{2+COiCKo|z_ho%@3$EGpq#L$7&*_G8#;D_*Qbam|3@8Ig%#ic8Q z14~Uz+R?_qa2?1I{?*^n z&*4US;B6pW-vcH=J`u%O+^(C1^7xf;YUBH!_JvTM034z`<`Yqja=R^s<2Q~kO#-dM zDo?;@1Ele(l#q;adm5kM%;9KdpvalSN#j##ylNh$s7Sp6kj?yf=ao(v0MZp4XAUP_ z**SSB34!s>L$U~J6ECCg1<=}Ath4_b0N@Z=yV~ctONe9#pn$NAy&Z7pT5|p z?sAbtY$6&?K*9@=%+8%%vzzP_41rQMt5&c`=(xE8ocH)Yn00000NkvXXu0mjf DGU^Ba literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e080f9b915dc1058388ed36b15faa464f90efec0 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|gaUj*T!A!e zKEwab4F6AQaP@OMUBK`$GTaO(%2pEO7tHV<1ga_@`~!+C^K@|xvFP19$y4Zv0uQs{ zrT_P3at`FE70>LdT|8SQNOh^b|Fxe-87GSKJ$=$^UL%-rqavr{aT41c=Hr1Lg)&?X z$$w{fx5c>xxaI{H3M`J>&#wF2o8SFHky=yZXT1ovB9V=p-+pmEw@v3Z=(^G5b>2X9 z`*^YG(id literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7824960e493d251aaeb612f0a063691099e8a502 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zPkFjHhE&XX zduy*BQ=kCrgW_KA052|`&V>r!yqmUN35vLMK-gi?(ybd60=>1h>y4WIFd5U;aM* zYY@MKi$ZS4mrswbDqdZ*zm74a+is6l%5SBe6&!p2#N6*sK3v4-!T(!gdc*f-onuQ` zyKVU|?5Ywj>6!CJLi?|4B>w_SA(dSYuk0Ka?T%PmFn4 z6&NzE%h{!2rN?+8rST5K)_HTS=2yFy&FbDzmd<&V{ns zp0Rl+Rem@veZKo0v*p=I@aXW^Q^ eECPaSx8|>Nnq*#l%pn&T#SEUVelF{r5}E+JM&XhG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..adb8668dc61741c07cf1c99e85373ddae80fe896 GIT binary patch literal 548 zcmV+<0^9wGP)Px$-bqA3RCt{2+P_M}P!tC6?}`l;#|}CManJ`yz`Ax6`v6(Y;%Y&`#kn|i(9x+b zeE_v%XNBekib%;=2VF#wbhr-15*=>-^d_ev=Ldn7l-`filS|17z!+nUF~%5Uj4{R- z`*pej$Op*E$?W*LxrCImP)C#%)ycOl3&sEloE-!Wpn80+t+>lVS%9AH$%?rKqc?)v zwnSc`ba3l7;O$1XfU*EV1NhuG5j23>*wdFTLuZ=;=nL7s{*ZVbMSgx&by8Ad>I9MLsy8Y+< z?UQ=*R$c-{+4;kgW>$7UoPScwP6+ki7v&yM23!E@0Mxhu)B&h*0jL8|;{s3zpvDED z4nU0yKplV@7l1kdH7)>k0BT$S>HyRd6+j3Pd5^7V3flp?evE|+V6=q%e=j}@S*^2h z0rHv}h1U_=huXeZIT%q{zpBcq{|#rD&vOHA+Y&w7lkd%@kT3Vz_M+4s5T3o|F+r-0 zJp>Kl?&4XZFSJc;QgwjQ60%~hVd?`8fKCq24s<3GMoYw=`o@*21E{9PS*)9`148q6 mM_-mi>*`Ya4q%M2Qu_fMqZ=oYXb{-|0000