From db3a8dc95ff5b8fa73419f4acb2661180386f590 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Wed, 20 Sep 2023 18:02:09 -0500 Subject: [PATCH 01/12] Drip made --- .../Entities/Clothing/Back/backpacks.yml | 7 ++++ .../Entities/Clothing/Back/duffel.yml | 9 ++++++ .../Entities/Clothing/Back/satchel.yml | 9 ++++++ .../Entities/Clothing/Eyes/glasses.yml | 15 +++++++++ .../Entities/Clothing/Hands/gloves.yml | 17 ++++++++++ .../Entities/Clothing/Head/hoods.yml | 11 +++++++ .../Entities/Clothing/Masks/masks.yml | 20 ++++++++++++ .../Clothing/OuterClothing/wintercoats.yml | 18 +++++++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../equipped-BACKPACK.png | Bin 0 -> 458 bytes .../Backpacks/arcadia-backpack.rsi/icon.png | Bin 0 -> 304 bytes .../arcadia-backpack.rsi/inhand-left.png | Bin 0 -> 720 bytes .../arcadia-backpack.rsi/inhand-right.png | Bin 0 -> 776 bytes .../Backpacks/arcadia-backpack.rsi/meta.json | 26 +++++++++++++++ .../equipped-BACKPACK.png | Bin 0 -> 726 bytes .../Duffels/arcadia-dufflebag.rsi/icon.png | Bin 0 -> 550 bytes .../arcadia-dufflebag.rsi/inhand-left.png | Bin 0 -> 531 bytes .../arcadia-dufflebag.rsi/inhand-right.png | Bin 0 -> 500 bytes .../Duffels/arcadia-dufflebag.rsi/meta.json | 26 +++++++++++++++ .../arcadia-satchel.rsi/equipped-BACKPACK.png | Bin 0 -> 393 bytes .../Satchels/arcadia-satchel.rsi/icon.png | Bin 0 -> 410 bytes .../arcadia-satchel.rsi/inhand-left.png | Bin 0 -> 441 bytes .../arcadia-satchel.rsi/inhand-right.png | Bin 0 -> 453 bytes .../Satchels/arcadia-satchel.rsi/meta.json | 26 +++++++++++++++ .../arcadiavisor.rsi/equipped-EYES.png | Bin 0 -> 348 bytes .../Eyes/Glasses/arcadiavisor.rsi/icon.png | Bin 0 -> 238 bytes .../Glasses/arcadiavisor.rsi/inhand-left.png | Bin 0 -> 330 bytes .../Glasses/arcadiavisor.rsi/inhand-right.png | Bin 0 -> 334 bytes .../Eyes/Glasses/arcadiavisor.rsi/meta.json | 26 +++++++++++++++ .../equipped-HAND.png | Bin 0 -> 473 bytes .../Gloves/arcadia-combatgloves.rsi/icon.png | Bin 0 -> 630 bytes .../arcadia-combatgloves.rsi/inhand-left.png | Bin 0 -> 371 bytes .../arcadia-combatgloves.rsi/inhand-right.png | Bin 0 -> 372 bytes .../Gloves/arcadia-combatgloves.rsi/meta.json | 26 +++++++++++++++ .../Coat/hoodarcadia.rsi/equipped-HELMET.png | Bin 0 -> 770 bytes .../Head/Hoods/Coat/hoodarcadia.rsi/icon.png | Bin 0 -> 369 bytes .../Head/Hoods/Coat/hoodarcadia.rsi/meta.json | 18 +++++++++++ .../arcadia-battleface.rsi/equipped-MASK.png | Bin 0 -> 791 bytes .../Mask/arcadia-battleface.rsi/icon.png | Bin 0 -> 416 bytes .../arcadia-battleface.rsi/inhand-left.png | Bin 0 -> 490 bytes .../arcadia-battleface.rsi/inhand-right.png | Bin 0 -> 476 bytes .../Mask/arcadia-battleface.rsi/meta.json | 26 +++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1143 bytes .../Vests/arcadia-combatvest.rsi/icon.png | Bin 0 -> 355 bytes .../arcadia-combatvest.rsi/inhand-left.png | Bin 0 -> 353 bytes .../arcadia-combatvest.rsi/inhand-right.png | Bin 0 -> 336 bytes .../Vests/arcadia-combatvest.rsi/meta.json | 26 +++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1236 bytes .../WinterCoats/coatarcadia.rsi/icon.png | Bin 0 -> 497 bytes .../coatarcadia.rsi/inhand-left.png | Bin 0 -> 442 bytes .../coatarcadia.rsi/inhand-right.png | Bin 0 -> 450 bytes .../WinterCoats/coatarcadia.rsi/meta.json | 26 +++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1202 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1799 bytes .../Jumpskirt/arcadia-jumpskirt.rsi/icon.png | Bin 0 -> 587 bytes .../arcadia-jumpskirt.rsi/inhand-left.png | Bin 0 -> 899 bytes .../arcadia-jumpskirt.rsi/inhand-right.png | Bin 0 -> 927 bytes .../Jumpskirt/arcadia-jumpskirt.rsi/meta.json | 30 ++++++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1224 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1637 bytes .../Jumpsuit/arcadia-jumpsuit.rsi/icon.png | Bin 0 -> 581 bytes .../arcadia-jumpsuit.rsi/inhand-left.png | Bin 0 -> 867 bytes .../arcadia-jumpsuit.rsi/inhand-right.png | Bin 0 -> 862 bytes .../Jumpsuit/arcadia-jumpsuit.rsi/meta.json | 30 ++++++++++++++++++ 65 files changed, 414 insertions(+) create mode 100644 Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 7277ebb10a8..9b635d6c716 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -274,3 +274,10 @@ - type: Unremoveable deleteOnDrop: false +- type: entity + parent: ClothingBackpack + name: arcadia backpack + description: A backpack produced by Arcadia Industries + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/arcadia-backpack.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index b9cc9ca2663..4d95b4ac933 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -232,3 +232,12 @@ capacity: 9999 - type: ClothingSpeedModifier sprintModifier: 1 # makes its stats identical to other variants of bag of holding + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelArcadia + name: arcadia duffel + description: A duffelbag produced by Arcadia Industries + components: + - type: Sprite + sprite: Clothing/Back/Duffels/arcadia-duffel.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index e80b0d6f8b2..3d5a1a694a8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -169,3 +169,12 @@ shader: unshaded - type: Storage capacity: 9999 + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelArcadia + name: arcadia satchel + description: A satchel produced by Arcadia Industries. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/arcadia-satchel.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index bca32d99670..ad448d047fd 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -188,3 +188,18 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesArcadiaVisor + name: arcadia visor + description: A visor produced by Arcadia Industries, with some high tech optics systems built in. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/arcadiavisor.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/arcadiavisor.rsi + - type: FlashImmunity + - type: EyeProtection + - type: VisionCorrection + - type: IdentityBlocker diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 8b76554f929..817ba31a494 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -385,3 +385,20 @@ - type: GuideHelp guides: - DNA + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesArcadiaCombat + description: Combat gloves produced by Arcadia Industries. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/arcadia-combatgloves.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/arcadia-combatgloves.rsi + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-black + - type: FingerprintMask diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 38bfcc879dc..620aeedc80a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -465,3 +465,14 @@ sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodArcadia + noSpawn: true + name: arcadia coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hoodarcadia.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hoodarcadia.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 1d2f1fb2ce8..afb9cb1c991 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -505,3 +505,23 @@ - type: EyeProtection - type: BreathMask - type: IdentityBlocker + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskArcadia + name: arcadia battle mask + description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers. + components: + - type: Sprite + sprite: Clothing/Mask/arcadia-battleface.rsi + - type: Clothing + sprite: Clothing/Mask/arcadia-battleface.rsi + - type: BreathMask + - type: IdentityBlocker + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.90 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index bf3949739ed..707a5f84f1e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -508,3 +508,21 @@ Quantity: 20 - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWeb + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterArcadia + name: arcadia winter coat + description: A coat produced by Arcadia Industries, seems soft. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatarcadia.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatarcadia.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodArcadia + - type: Armor + modifiers: + coefficients: + Heat: 0.75 + Caustic: 0.9 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 3cfc8228348..146c427ce9e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -812,3 +812,14 @@ - type: Construction graph: WebObjects node: jumpskirt + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtArcadia + name: arcadia jumpskirt + description: A jumpskirt produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 7f784bbf99e..6e81ba938d7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1301,3 +1301,14 @@ - type: Construction graph: WebObjects node: jumpsuit + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitArcadia + name: arcadia jumpsuit + description: A jumpsuit produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi diff --git a/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..34e8d5fa92c17f6a77ca1ba3c01f18b128cc7d2e GIT binary patch literal 458 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 IM6N<$f*kNXu>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aaa121732c89bfd22fe81e6e277d28ff033d3d5d GIT binary patch literal 550 zcmV+>0@?kEP)Px$;7LS5R9J=Wl`)IrP!Pv|9(RopxG!)d;DXJwUJg7skgfG22o_e0%QiNC2*Ju? z!NL!atrqqWudvxVuMr~X`UOq`wsTGL$nNE3qq}fTe$`}VGV{;y-ULcYN=i!pGnI2* za$Q$!vE6QWR?U-|+XUprY<$iODy2-ZiPp@4C&zgai=qf8_9ZMq=D?Fu0BEhPQ?Uk= zQsVnQolb|Fejk9^^)++g`(y&ZcseDDA^;r6F?p|Z$J1%9h|K0;7>bBU7>1HOFF}?d zJ&;G=mq*_hrIfg?D@rL*N*Vv_-1Icle6oq?cDwwjR5%$KSV7*>*)9>^9;ei^MyZyZ1XYPUL{T|>&?(JyASFJMzSeHW&WDWd@x7lS} zAlYsSS)0&o&D17rf~-#c_w+!T@g&|uGhRqpu{RYZlSnA~6=~sh;Lh@1p<-$E>%7Di o^^|REURZ!lOdfenOG?uG1$TGYHcT!h`2YX_07*qoM6N<$f?l5gp8x;= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0ae7f67956d9d863b78527fcd9321ce58716bf6a GIT binary patch literal 531 zcmV+u0_^>XP)Px$%}GQ-RCt{2+OclJFc1ddpQ>W3gm{52kq2~R$IN{WraV+89sx0S>C&;NiMMj`mrxS`2A;)4WT%rc z#z6?dhQs0JyGPAlolHSQOhjw}*c)z4RV~kR6A=p`*yGpn=Da>NQ(w!`M8s5e^V#ok zbNq4Zc-tTxs_EVTD~}@6Eb}Onyyj0_2H+<}QD8J0p(qNh*K4<$-mX21Rau5R+~7lB zPy(1vrvW_F@G<0v9x`PMr9ZT&Y7wj5|(%fHq1?z`J7B?oLJa`2oO;~)p@ zsYAPy$;8H0h5edm`5J7r&1{#M_xQ~*+(+|Jhr7&tTg|`LAR;0nA|fIpA|j&ypl@#A zV*g@JkwtLnRM-9gzHNAB5!@^iH=ZJk;I=)ksy0!@Gv4tKUooH0zul%DymJG|@&TvR zCyU@V0G>gJE_QMQWr@{lg|aM9*8VrDYRlzvXI-Xx4tQn}++G!`YR#` zfBI`C_+fYbj_WTNJ78dikBF;TY1^_}DX~*zMFg1}PCsor{BT3T`nfu%z1Dv|7#!(( z#N|j|#4WK68eKjvI(^B(q1H*6(g*HT?p^-g@%b91PxTMQ3_?vq_h#?0UbiZ)%<1+T z{aE`Kx;(p=%S6UrJH=-)|GdW}7DoXE&q+2qgdOw-h zU-NuTVdB9RQS5gQeo}c) zC!gnv*}sdw?J_5A-4gyv?@Q^Exk+XBHwy{Ez}eGtve;Ic{JU9k&Xn2z&ANeb!;_HRFU=vlz`e z7JpcnwqOTeF2n8j->*Ga{!s9G)~+-Kwl^wF4B@XGB-$S5?hd}rv*Y*fn>U{OWZ&rq nac185UYq{)ZSPTj<{!)n&h?VYpWQzLqmjYW)z4*}Q$iB}lXU8~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json new file mode 100644 index 00000000000..f10bd687350 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 | modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..f9bba2fa33e9226220cef9bc8f6069792216fabc GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`*a!H8xB}_F z;^IIQl-VsWFR!DcW5dAU;^Gn<9GsPvmCL|TP*AXS>(>1Y4F4JUH!fOq<;9cYATNswPK10xd)Py!V!igsEARB+wX#W5tJ_3boAu_gl^m%vLa zG<0U&`@cpk)=Gu>>hopwGgFo={NT~H@bb+E+myL>zUxr>!gts+vYCC|mCh^vI~q+7 zzvO?mW7ZADRT*cum%q3=C+(f<>zZSos)4_Lx#}9|-1J~R&2-qH>wJ^D=Q7>`_RiX- zTRMBzPTYIA>YB&&GOM|L%>SPsHn6wL-!~)6qV5jUSx3i&5BKVr*wxp56zs8UxOcQJ zVL`m%gX<^#;|>e*`}ytf`)^pUXO@geCxtm9^CX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a23a943a374f84f35d160814fa3725aef6603a2c GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|JOX?|T!FN_ zyu6N%jtx+ei;J6^TX1l2Qc_Yf14C9;RxSfWUS3{7LBZCoTlX_CoIQK?KLh{9MT@SS zIrHxB-T(jp-??*V*M<#qCQnw|@MIp)EQyjJzhDNS1UB&Uj*A&k%^gn{#}JF&r;}p& z4lD39cRplXxb3mxgx~i|_-?5!*nPl+duu@b9}CqM`>-YN;veo>_fc!zUGv-vQKG)Q zs>fsU_Ia+}+G%;v_gpgTi`N32&KBp6J25ydHa8PyWa>OR-EZ}8rp3w$Q*53(i5D*J zZTE<8j9Acj;mge}qQ#m?nlF5g&(tfkn8Wakl`S>k*@FC24@10|3=0BtJF`D5+;{ky z^@T~5T;6Lm4l(sC=sF^`XZrAJFQ moaWr`QvA`pcDJMb67}gP`O~D1%+vzd3E~R&Qt^DWi&b~24ByhXB;X(D*Z|fV}nQ!fyH}me+#M^7{Uv8+4oxj9Bb`RHG2D>xc z-oM@z_v-8SzTaC)v(F~J4c}e=f zXg4#3B)NswA-7vztbJkH|DfvLJ-d=Gk#$#Wnz}b{TX@{2DSP=l2787*^L8*99}s6q ezaRdu+g~v3g8aVHtt)|X!QkoY=d#Wzp$PyxOu|9{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1de11ee0eeb80e8dd08165a70c016c468dd4247b GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z>pfi@Ln`LH zon=^b$Uwlg{+7uTw(3UPChz+#R?7pu&rNDm-f_k9(m#=tLWYcNIg%%h|A!jLZK>bC zmG?KJVvB$i2ZT6cdZwp+%8e*@<1;-fyUiL^7!zdNcl|b+Yx(>#j<%(OF><=KZ6 zRpo+|JfF?UO#582>v!blkIx=oIQnj#%gWM;e&zP2(wpVy7oWQ;C2;mQ?~Jv@3@_d- zKYZ%v`>mA^{;=s>l4OgKYMjTrVp%Z*$DiIqVzb!m@(w6l#jmrKV34byKfQgguW+Av z-St@)qFmGOG-cnfUb^a>?Sb-!-@PXLMd!kt3Uc&D-+5a#{=WHo|K1JBb(u{wC*C+4 zUwZvXP}+i++1J;JOTXL{_ExIASlf8RwQD=>1h}ugWhy5WoW^#nFviwcVA=7meVG=E zUDFQS{eLy9j5{iYO|RF1W#K%()n^=L2%NpX=KF_503a344>d|4^bymU^0VDw|@qcctky?szS1sE?3p00i_>zopr09ww+R{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json new file mode 100644 index 00000000000..fce8c90ce86 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc055ea6bc070688ff1d4ed3c973675a08576d8 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z#XMacLn`LH zy|ppxkb}(ekMY@xO$D`$+@`N{r?1SDt?lg7lWf`NzVN{V?jJ(6%)eP?vgkIxk(H5o zV#T?1qE}AR$~ybt6Cd}>{NFwM(`1I2O{B{G{ z#d#u`5hAbLCI-FN_WjA9^)_l+>cd>S>xYvT?zntW$5X|#|Mb!{&qcovI$VCaW$WY* zCUWiHuX@S9E=_&2?fT`|{p+WnT=IAFi#go8vp;;51bPGt3f`^Rs{Yga%^dD)w~p-# zwpQ5a|EkvDSVqV+U!U>`hRZfO9P_=~6zh>RKWX>huT6ZCVy$tHBPMD2W>_!ysGOZ^ l;p(IIb>Bs8n0W_Sf3o~5@S0k-$7UNy%+uA+Wt~$(69D{Gm)rmV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9156d3557ade883a564a91bef58a5a37d8354749 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|6a#!hTn`*L zU~FpS;NXywk`fvkYCO|e?-WDze}f`k-hKgrZOY1DRrd1$6?2ya`2{olhlAR(+N(g} z6i*k&5R2Zo6D;`-DDbdIPGjz?$bLK_PMyHpPSfSz~^^BaDxAYYeKfHd%te$*yOq@BRQ=5OZ`^c zI=5xgoIuln;DCBwXzJqPYo&9io_M|MoZIs^VWF;{;%cYze7<*kZ|>G-YhG_!@&0#z z+q>WQ)}3Btntu0o*uCG*c20r!s*R1M=Wf1e$*uS&>xIA}|F)So1E=f%Vp7pORw3Eu zIBCnXHB%-nIo^8j=Kq-KL6>H2R>_oLJ1U{SG=1t4XQ!pd_wUY~J!@HD?Dbj8UcTMz z#If!D?s>nTSK8(HL7WD5UVZo?+n_!2AHw}^%4sf5seTfo|DfaBiI=m)x41JfJgs4F W5${-IV;sl~Qtj#L=d#Wzp$P!$3XtId literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bd2c2c6f6048fb80de6db642764c6496e32101bd GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zIXqn)Ln`LH zy=B{V*g&G?;mL1iho%QUwpws*ZcSgzk>?*ci&!2DFA?40KQXQ*y3+iOf5+y?q{F|r zI2kC1^sxYq1A+%p90#qQzX=fe_Dbiwg-C1Zxk!$O>-OYt=bOE3<6nb}Q<2MeP5WMV zwg181?ZL6xry_qR23$7jf8J{t^?Xk0xtTL>-a37L&-b)6`J2f-=Ee2D89%p9nY3(< zs%P%)ESckX_p8)xDwHYDz3l}QoEkLg%gxuT<-Lzeye-=KqQ-9ZDlOUmUUkSEW}}8$9d`vzk=d7!r2h YV`T1cU9cux%f5d&RVG>T_=!z_ zKD0ZTt+w2xWB(>sNtbJhDdt?$2Mu z@!HRP$GvKsZMSu+j@>wz5%lthwWrb6*;n^m{8)Zx;<}GL$ixi5}oPunfDRwPlR9$vNjG zW~&6he#azJEU$KcVa~SG4~wqOjojUEVQypD?$Gj-)YQ$h@407u;hIvr`TV9mCq340 zy6O8~dCr&0KU1ukpFi2%FYwDo4-|OQUrF!V(Zg%vcX1amt{6OB{an^LB{Ts5m>JP)Px%FiAu~R9J=WRWWPZP!RrJ6bPgUq$yy?6g~0_+^*gn45`~q!GobTc+cGbkl9Ec zJf!i~x`B{P(ORM*gO@@z84O(_gCUSXxen>QzNg3zrb8Be)9G|~-}iKPPe6$hB}%+9 z1RGHl{a2w*w?}Lb!oFA)3jnoR4FIsYE{Q+}Aq0XT5W4^7>H+{TOH+LCeG0?yMG_UH|OUCUC1812Oz?Zq6`dIPgG1;JWMKFu-=Z3pAgDQ>PVj6r2Q6Tk!YWv7B^ zmZ^e8LYjU{*+t}^Z*Ps36^Srfz~r+u1@JUb)p`TX-!tr57J#Qus$*z7#`|fO;nVds zDz0nPd3SJtuV-hfX7cN&Ih;~Tx=Rw8#4+u8`^uigv9gbCn@${uP8^4hZJVT&6h#sC zynQ2%^Y4;`q?GEN=Xo@VW0F!nYlSMJlk0_wNTMhL3(({ASX~5@>jST5U=a2NuNAMD z-ai1U=e&0R`j{EdgRn0?9v!K?AD5RZ_mRx8GoCiYqaw=h`>N|z2%*RrK@fyIbe4fHq7o%alz4Ug0r#7f!b3yz Qga7~l07*qoM6N<$g5vfeApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..113431393226ba963cfcac84d26e3cddc1fbdd73 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zbv<1iLn`LH zy=Cin*g)dg$K`jGQ#DTc`{QvxtPWkOsMR&Jty%y_!v0v=c z_J8JXcI>bH3Pf9??%(s6^e)ZVGbrGCl%JBV-JSZMclUkWE%94wh2_Qt>r_3%&->33 z?=GJ_f7;SRn^(Mjy}2$t&MYB1G%rqPi=DrTuD55tuv~xK7A~jQJhLdjMce+n2A+s| zU32w)Y>v?NJ6BCk$L37>#wVR@clWu;>AB~B)h~=Za(tWNvC{aD@8iDg`wDR@khEY` z|Gxc1dfkC+yMzqqC+vHkGPjw9)ICrzd+^{hbFHjv-2(kj%nSw%;W{>wi{`Do#{$yo M>FVdQ&MBb@0EXwDivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b72624fa2097f9b04f5508ce3f0024ab45870335 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^*mi1Ln`LH zy|vNnu!GF;kMWz?jY2lfw*JI0b5qLeD+?cqym+wt2TyGyU(@6Z3!~*0F796NUcn;u zql}8;+OB1qGcLbR-*q7N(`k7<$#?pUK;wbnK;w}m@3tHBT(qvACjPE&d-2_kTd&0) z-zeVtVsibZy)XPC+9#TAH=nd*_s^I~BGZ{UV%N5+ynOXE zvb$*K_KL93u5*vd-p!DiZJ!~ge`=}O^Ob3#SM@m5)ErKkwOpm?|%N;QPPEgEjBvEjZ8JXMDh4#Vqw#a*@Ea QU7;Y|p00i_>zopr0M2o!R{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json new file mode 100644 index 00000000000..b943c645076 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/55d823b97dda098a1b2ee9edfca7155c753e456e | modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..847c6f7f4f358fcf3d72f9897abb2ecc9a4e47ec GIT binary patch literal 770 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Tng|BaXqqQ z+3J~fHYO&vwzgJQR+dIa<^~4#=H_<#`VNMMPR7P=c6JHuoN4S_j+T~L+`Pp+{8I&l z+xP@#b`_cG>CNSrveMCMkX79%EMKasU8tGBfrON&r>BpP&lYjzEmCS89vPnvLqkKOqN0G_ ziqeky4W!&kg8YL2Qv)z$PII{c47(mr7srr@*0A-$Jhh#%r-nDDEVO)!Ch;cAbS|oRp_nmnlr>}6*l1FTrlM-y^ z8#c0@E9#m4h|Rm_Gmrj^16gxZXV+-wZ8&Qlxh>AH@$o8+m~!>J4aIjCE%+9H_tepU t2k!c}9Nzb%^rgLBuh0aby9=JzFnu(W46RpwvIH2@44$rjF6*2UngH9yNvi+= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..82210cc8304bd7565fae7b1fd102b2d9b7356597 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|(gJ)!T>AwC z3i$XeEiJ9BtsNa5&CSh~7337;q?Ht8HB^;Ul@%n#MP($#9UL6&?CeyP6vRY@MT7-) zG*sQ)-Dh?cd3bm@J3IUP`^!p6golS~s41D7>ihZm1qTO*goK2KhK7ZO0j+Y|^tKd8 zDU}5I1^*`m7L|BpOR>1AAR%<|xWxI7N_(77704d1+ws)> e^KbsstZG~5mNT|whff4Li^0>?&t;ucLK6TgKaMs4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json new file mode 100644 index 00000000000..69a56daaeab --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Gotimanga for SS14 | Modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..d4db18521483e62b3552cee0e1b8cf2ab84e9a86 GIT binary patch literal 791 zcmV+y1L*vTP)Px%(Md!>RCt{2+CggDKokbxKc$2xND+7;ffj=njkVIk1|#SVe3R1LAXhS>H;FM` z1(zT@U=&*jMhVr!8+8$++AS@NWVsD_-ztfm`DezXLFf%2-nO%*{}_g02|xp|=ks~v zc3S2G0NUigZyNsT;Q<38d&&%iVR_0)*vm)T{C7>lEz83FXoN|c;(j!OWmyN`NSCVo z0TCu?iUCopeB)Vj9H%5A*tQMJvQQKSwANr|Y&M(DSApX=rR%z|EDIlQZ}Bu7q9_VH zK0Y?eH(CK<7?xp{VVvi<+HS%89aq~e#(9n~%Q{~LRr^|N6h%=FUTb}D-GtEuR6&(5 zoAj^Ok4P#tBRs(Oc2Q=CQ!z{zR*Q@_l{eFr~ z@You4*m0Z^_&IQ(+3f!hjGqI5m%+NOi-qUGb=_Axcp-!kLI@#*5JCtcgm`lrzs*%j z9n|4gtJO*03?D1M(Q9#~RC&GIAqWBlL4fPs?zawg>6rP(6QGnT$9axPn%2e0Nt$Au z=O>wj{e0l1VA>|%XxS*G${+}!wMHDr2iJ&RDuZ3$3e_NgErj~M58JkJcXwyh2je3$ zRax5ieE>il#|X0wA1^L2Ai`(U1`S>Bc9=5b+w(K#yt_~_x_y6U3-D#P;D$OrE4*=@y{ehci zw|Wk!I&isOW8rxxIVe>f(%R3g4oh^I`$tNt@|4d2|2kI)A%qY@2qAPx$T1iAfR9J=Wm9cKZFc5}+stS3?5GZm)DtV}g$l8H969XedUnUR0>*P5Q14E|> z)Pcc6BuErxu(G66EQnCaC6zkV-)850_v^oN3>XZC|IVQ6K_Nud+&i64YfBkp@T3F)%q$DXqR`^52QW#J zhxtj@kaJ$u#hb;N`)!H?#1=O&IZ);cG72C^)}=XeaI6nx*u zC5qttJ^<+cQ+~yrUPI1#HGQ2TJ*V3C(aQ+wIqmc!8Vm-*pYjcUag6309=(bH0000< KMNUMnLSTX&1i7vN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0242ff14623098bd2ebca99d587cecc33195725d GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zmw383hE&XX zduzYf;Q$e~59fotxGu$X?M=C;_o$3LJbb=F^Z5r4tSx@c%wgWMe$Mkbzjwvyh%v?gnEXO+f(qxFtrb?*&0EEG|8^9;S8eg!VD{O4qRx|U za7E}%cV}pdTx-A@FwcH|_^HcL?D5I0e>vBd?#SETd@U;F`n9O`PZLfkDins=5$~kVat@F4RWwRw}Mn(VhuTsyCAK%fVbSHm% z^;45F){M14-vSkfSN45;sX3?k!@c)cC+2;T3pl6jqo?QcOi(I)yQu!nN%>Ri|9*A} bxy>%bP0l+XkK%kA5_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..49eea949b9a55ee1cbf789c718d630c6010e8af5 GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr+K|-Yp6)-0d75K3}2v{Dp<@FD!J9KfW>l!d1n|7hGfZa24ru zoP6^3f|in+o7BZE&$qiwlJK+hX#33G0SA5oUOS`HHM}&Rc0F4=-}=J4?Nc@hi9gij zx%)Y*^wgLx1ho^zY|u**!EDZauc-e)~14pi@ObaTB+SU4AKY zEoupCUf46?4KaGz40EE^3o_r(t-p4E?c>S+O5+q;q|K!KI10bVGd!@)Uw?hIPn;40 ztm@FZ^7Q$WvgYL>g=q@sUH9I6c!q(YB{5<}^ZxXmUw>?TJhO4z`{anmnTMDFcl)tOy*hTF#swkmrIk~&J_r4MJz0H`{Znqq)NR_UzVGe>Mi+yp LtDnm{r-UW|1@P9= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/meta.json b/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/meta.json new file mode 100644 index 00000000000..f1fcc1393e1 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14 | Modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0acf8ae08679f5dafd6c423141ce11bdeb51cceb GIT binary patch literal 1143 zcmV--1c>{IP)Px(F-b&0RCt{2nonpOM;OK5#zM=&A|d=&2(7_XLc!FAUIe8C9U7EN2^6Y}Z@%bO z>YNl`OfN;ygLGXCz4@X-At)qHRa_H%DLE;QXk-~-s|bP}VXbV%tdO-mG+MOYl`|u} zUee6(va>UzZ{EJ084WuFFc=I5gTY`hK212%ic01Uf@@(70RH)L&-A;i%B~BV_Pr}J zL@{sCitzb-Sja}T!MufRRP*_Kw4p{q6h-}E`vlj*nkb4R#dFa%esFMrKp=qIKYw8m zQLon#2n0qFF$$MW7!~Rs@HC&t?@ykfUay1ac|H9!pT7=0AB5+5h@uEl6tTX(uBRs^ zCPs=!Wx(0lnVv2ci>CBoxgGSoInVRRWHQ)DCXvZx!1Fv#Pfsz*Fd#M{xE9u2E*B(8 zLLnXp0DS-M9RQ#Zk3*6qxLmGl>zY>W_tVvC6^TRw0FX!|P_0%i>ybd!1D*XLVXG~uWa1i^5B|NW$U|I*}px!#8$Hb4*rl*(oNsj63AX$8=rY5%?4xw$z! zIynIVJUTf+C=@c3(?C55I!U|T*3-FM4ok9(TrP);iwjdZDbx$0*sbB7ZTEUNvJe^{ z9|r)W(`lqqDF8sD(Evcd5TY^w0K(}-?fm@QR4xbt_EJUL9=^|2liZ;Bwi)oTVB1po z{{}O_X#q~d3~*Y2(=Y>^7T`3@0H*~w4Ku)L0ZzjVa9V)VFaw+x;55ttrv*3-Gr(y9 zPV>ndK(#yk*-xMAUu17bBFKOHtLfS9ghZQTG5zk`M}o@V3z~ zoD;BXPtc0NwidEc?QNrhP$&dRlBi=5J2g8yt9d*g%+Jq5j%K;9ez~i;-EJHm9YIkP zy`G&LBY^SYyBFH zIt*e1j*pK`c~Lp0b-P_`K7I@USX30^EvZpid_UCw*xW?7+eK84nI>N=t-~NTAQFj~ z^7=cn0I(X1VM&&W8y*Gk$_$od8LP1v0D$8-gN8mPx$9Z5t%R9J=Wl(A~VFc60S1c4D46-_A>(P+q$LYJ)F{5FMd-9olPhvZ!h2{c3c z2r)E6G8v4ZYmJG?5_KuY#Wd)^L!tVXJA7y9vpEj%cs!o}PS3URbN+$hG_nAY&kn8k znzgIPYiEJJbLTfwN{km1+k7@&OstfWdK3VFQJTXrM3!YxN@4VJ_d~)M1EmyMfcytm zNrKnq62=$=K~U$bBq3i;7AVWI&Ub0r%A57h1%}heGRB~_#yXAx01w9_0AL-*&{~5r zRu5z62qEnIc5CN@!Nn+qAPG1RA?F;s{T`ds2{#ua=Nv^*I17-6uxrSR=)V8E^V|7M zUPPolkk1ai==s)GRn@9-&XGT*&L8CQcs!mz!xyB2eu|WA2R;A*002ovPDHLkV1mml Bn8^SD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3fa938f5fcd5f9c0f0570e21a457e8b97f765fb9 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr9E97Ln`LH zy=9np$Ux%g$LmUFuY;2m6;nGUHf<=Qm&@83wgIZ{XhH7 z!`f}4+THe?Km$SGgRS7hUF&o`OJl8-?wH?CU3c8MLVi((muK$nEVJ1=bEB6|dADlg z-Mm`=Z!e3^?VDEo?knr+Rhx3xcOBXm8+!HrE=J4rwWot7ZPD|7I;Z++?&?gb+8nd2 zS#IAFo?pK$;HrE`Q+4k7^xosibN$q1`;Y6dzxvd=_A|tC5c#ivU3!Au{OXMnJm0H+ zMc>?KS#f>B#p?>^ANOy#{kFtHM(=Y+#iKkq9i=^5U9+#vd|LD~%G_a++v1Czopr0HZ^gt^fc4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7fae5e927cbee99671588f6583004ec28e58ac96 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjbDQLn`LH zy=B;S*g&M^;Z4?ZryESk1`?AGP5+=ciTTaRB9^Sp0k6c9pNS?ou7yNC?B>AON?yX|JwQXyz{OL>E?rwWqEIT3S(#lmTp37GSd1WqL@p{AB zM2Rn@cG(haH|_V|KOSUw?1ey6-uBsDi!OYvy85&z(q^}7@xPn9pRz+-0VKCAT9@7b zxMIHIjk)Vy>v%r4*!6nXcIgE_!av*pSzWxxCHA`Aw57%8e(!2HKJC2a`}NGTmVMmw f&#Z-o;l_r1rw18^HqXU9K&E-R`njxgN@xNA9hI3i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/meta.json new file mode 100644 index 00000000000..0490a574c94 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..951c190ef6369aa2fb90fcdb5aa701bd351cabbf GIT binary patch literal 1236 zcmV;_1S|WAP)Px(j!8s8RCt{2n!#(^NEF6D)qB`O4GESZ6beg&h_H`6h7t84lX3HhgMrK${qqC;Bg($WiMXsp?R}oTe3B>lpZ=i zFt)~HeeXSuW~_M+P$(1%g+ihDM$u$Cm(ywQZYqW6S65TNd%3jaosUMSxUSSWqv)TH zMhJSB)xRavnM4f3@Wgh*Fg!9MN#;2pML%=^nwG_#e0+JygJ2kj_xSRX8_~2ZZ{E40 z(6lVCZkpJrRFFto?KU=BEo@Y)sGFv=ey9L6Ez4WYd&Zx0T5+nwd*v3CG?dvGAFKQ{m*PD01|{Mc|K=a2JwZcv;-5cMyHL-ZMg zW81hG4gmlc!yz2oMxQZU42RPCp+*3SJGKp7*SXUGcrbKb=Z1+_B~BdM#(ty0gK*U8 zaOd|M4LG(fea@Kypy-qH&-V7f7(?AO@n&TO0PtpI1$EN|V+_ys_IMED7zN_hKk9VQ zXAA&%5a_kvXaE5EjNz!$ks1Zx1$|LYr@gaM35VBL`1#e9MiZZ|>lh3Mysxh7V2mM? z$zZ!s&}d1#n@XXaPJ2<7#&SCC0l?1>ACBp-t*wDEhTq@48|$y@I(~Zn8ogeR>u*%6 zbM*rQFuBBtu-99lFg!X2fL^bc z*grv0Ukm_aEV8~-=cZ+O57yUl)ad{KwhIM~CK_trE))_A08NU(`1(&vqGQ|A`ci*| zi3jWJGmmcya(od2=YSyS>d$LS3dgoVOEWNj^`j7axcEJZRa{pKYL8@%q<$PvgrRSN zitB2A%iB#jAEY10S(jHc~y$`Mk&?w9-bze*4$oqu|II%QkfE&9;A!jl33u-R$>_&!{s0^->ARLww=i1i4hPg~2uJJQ>kv z3@>W6shWW#5$h3N)M`9sF4{&l17QdifSqz#^ApMn`MFv)i;C-NFPD}QsSyIc%=i`8 z)oR%+ZzCHfFU(H49O_mKJqPTR%UaX2ygwd28k_i@q*ADxW@snkf-#0CpFZJmcNb^E zgm~}OtI*B^lBuz?QptC@5lQkk@Y9;IrBsqSr&It)=r{8R06-VOzxaNvkC@Akn_q9= z23(gPALsM9g?|75?==lS{`GgV^U!30B(-gAZFzp*C22>HW}$kWS0ntt}kAYC8e*fx)H)SP@Ah}w(Tvrv72-+R(e yhm%i#i$0u1DwqFS&J**3plSpZ3WY+U2*rPKwU*;eAn{TF0000Px$t4TybR9J=WltF5PKoo|5Yqx@uSp~8RlYkx}^a!Ch2s9^1bC4uAD9jB!fr}Dx znN5WxxDtX3Z33=kx|(59qH)?y3w|r-J!k%Z-t!4`baZt5Czh7Q*S5`X<<_>%mzH%i z*TjR)%LCIyT2-KwUI|f3d0JH%n5M3NdjmdWQe>KC(gdZHPqR##^BL2sLMsD4V|?hk zmPX4_yiCB^LlAc`Lqc*v;EG}+3FipH(E>esTg8hCk4UETQds4z(?)<9)kr6>Cf5jH-MeOEF$`@wVr- nZo#T7ja%dO8}W{gjz7T{!x{!XF!Cbq00000NkvXXu0mjf7%$aD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b61690e51c52ea1a4114c0978a811de72d332ec0 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zOFUg1Ln`LH zy|vftaDWK=hx+c!dFHJDuRi$1(>vaI=RDi08I)jP5!Vl|li}BWk3PS;F8NZV1Q$cb zTGwpd_V2Sg{)cWhnBptb{n+A>w(7p1M;3iKk0L(VxZM1)sBhK0f|r#CQkWPjUX?L2 zs53kZ+#SDO77jZ+fLcJk0PE0vM}s;^}X=U>zkVy?=O9MIB$CP-c27}kiZw# z)&5bN)II*cdU7J%>rz}(q=eLWzL0zJ7nb~f`Q`Di(!FN07EcqKskY>-@XFgCZ)p5o zyH;}T))@IcrI&wgH)C$772|1QXjU+oclcI*gT2&4lVCQrHM)&&^glfNxwN*jFwb3E d_Tv4IY@&9nOSr-X8-S6);OXk;vd$@?2>`~_#;^bY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad05d19d153e3113c251c9ace375295fe72a28c GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zYdl>XLn`LH zy|q86Bs(rv(dlSX!1$6l1Av(3yMGeS*(iuDdFF zPK81TE$8s9%>5Jm#cS2QZ@+y{o|S!PY5866Ig<+ve0l%V>*TWZ$#0~b>q-}hvoJAi z%k9p+JxR{^=sm+PO%BTfRr(%xte^73tMjpiQLmDrD(5akkxTl@=b3NiGC17d#K7>J zfh}=Hjd4RBPki)&aIa&9JzcM#g{g@c4qgte2vC+5TjiuHGusTE@C( m&%USg*Xz|M>$;Rw$glEVmOOD*$YWrnFnGH9xvXPx(Y)M2xRCt{2nqO#JRUF5^*PILOnx%C&EZI%zA52E`FnzHvx)E`217#6f#-=1G zq#)u;U=PEG(uXM`I!GIY6>M22NC#G05Gfm_iB=;mvc9ZrK~u4RtSLgFYoUyv5AD4q z{S(i*OT4U}4_wZ@zk74Ozw^82Pmb|o0 zJ}+DW@caFg%jE#T>;XoDjnc5^ayk6@!#FuTjl#|xM)XPtr3QvkS66E`_#ia53#ox& zIOeB`w{ETg7^EjBkxccOjWt*+tRtD~Lwa(u#QwDNfiDy`-+my_3IOQoy^gKT?ULuV zHn-8!dmR99=Ec)brFkHXF}gK4NRe2ahzOBb+?@1gXXZ-mw+07^F-Am$N*zre4~>sa zl<4I1dAfHuP5FGj#6CVYK}{YHcMss21bv|}K8n5x0C3*ur_AFGoI6&By=D0Rj50hl z1ORv^8WoQ;2cs{&Tvi_d78VxJ($Z2n(c-sZL_eR;(@#JCY@SDAaf-y^6?^N49lZLy z2+aWoE6b~8ud7WZ^|^+C5z#~-NN;~N0$^vxT`R1cB>>#M)CmB}XOA9OcBmX8`ijEU zG%!IQl-rj&3BbNFXxta9Pn3%5TNwfh044KyqolMVZjpWZ=Z@7`))yKA0FVd-%RXDJ z?q5#d=mo{vyhA`Z0M81%0kE_R93^A`>~_FzWB}}Tz;6Ec0pR}f@GLEbyh|V;dw>jp z41nDZ*o_Q;-458zkqki9{}Vh)$N<>wfZfOdSox5us?_ZD+VbN-Q4}N~^ z8Dmu6)-JRPh~@K332z=0vz+xZ~(M7MGpY63$F>)Co}|9 zRV7{1kj`e2xO%N*Pr!doI-3QslbTOly@qr)3tiLDpS&S7G%d{md-n$bJ3%mdLN#&B zPm|I3fAfh4p&`)hZUFEE$y6VXJDrvUtHE)n6UkH`06^C?q0d_WM<@{pQn?&`wK!~l zz(~^>Q}>U1Bh|?ag-)LY0JNUHNbh#X;XQQ{E6b~9`T5NO08pwq8AiLh%WD7j{Wk!B z^rOGH>Jyp+rXH@EjX#K8J4L&?MXKc{+SN_HJs%u+Z`V$(XD?#vA^&~>;brhdCIj`o z_swfnttlx_WHO>v3TYoU*{v1UEooc%9$@Dl0lW7nNF)-8L?V$$Bu9mR03qBOdJMHp QPXGV_07*qoM6N<$g4kXxJ^%m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..29bb0c5221fada66b663d531b2c478fb57585b6c GIT binary patch literal 1799 zcmV+i2l)7jP)Px*!AV3xRCt{2ntyB?#>9j*MU1Iw2}-KUOPe+-sB6^?p?2CzcBl=d7enmD zHMV1BueU$UUCvI3-?MBqvHM8Y-Mx2yzt8jD`@VPf`vnIF2L}fS2Z#Stq=ioEx<03D z)22;2Aocb236)FIf)ciA^!xRZvA5=w-?jEO-v98!@`@EA%d&2Keplx%T3$*0zy9T% z`LUK)RNN389vU%|m1S8U9vaCDrV@={=rsEMdZXW;m$Xr4#AT;mp)MoKvaYHs0MSSs z08I{@2s0X0AxtW)$>!imMF*~s=s6P@q4uEpQGOBA_q-Qc*xiZNO zmSgS8Bmj5aeLLA~Rw%bB5ph*jiALg_JaGbVLp|PxdK4uX#ire=}(Vm+5WRaB}wc{7#d zv$kiwOQg5XoUt89x%6LDFWAaS=we;hdFCh2>UXTY6Q9qG%T;am0LV?0nN03(1p9;h z?d&P(-HVsX_B)^y{qai^LUk_^xyW<9SO4moZ?I~03w77kGL!m*_|>Z<5=jz?B#Rcw zEcIWH-|s~UG$Pm3{Gz+-=^c^ize>w^0sZmz4Y=>Sp9>E^!sKfQn0)O3?)&cNgD0Ng zE1RD-^-ur#)DDrli#`ScCVGEO>mLu~wKPEHxvjW%?#bNKBXxJ7fB$ozov0uBg6)gM)*EgM)*EgM)*E z!xxB>{C>?ohYuYp$sbViA6JJD9b!5bWBayk zm0Oc9f;IWijl#8gS(f!(zua3{b3y@D%|f3*MTM=&7n&kUF(;IQRjbgjQA#7&8UpLv zHvpijDyvqv(9_q8x1kgnn0W!35y3Dtg%3Tj3Siu80_im#p7`k><{Jz^m$>`3ib!_c--{# z^_EnZtrY}ge06QgcYhc@AuSp$DF{0l8pbf#{?pm<|7w4*vU7mP+^OgcML)ow%pjnEnokZ-r3PvbbWqw>?kk3uvaR#N4QcR0ih^2 zcW=?}SbHa{R=4DdSqUs#3c&eubJp7Q}y0{j|B@5)O)f+|yt3RNeSYs&E)t-FHjA;UF z#UN~u_|Lzy+_Sz-2e`3m1pvvJG*cf<@&4rxfZR*SpAHX})f{1s0pPp$uG6i0hDQM4 p(!^x|(<4ys7#tiN92~xA{1;zx;a~d1Xukje002ovPDHLkV1o9vda3{b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a68b5009163e442bdb6d3f8b10edb05e113dc630 GIT binary patch literal 587 zcmV-R0<`^!P)Px%1xZ9fR9J=Wlrd-%VHC%I(W_Kjir7#>mUcKHWGQq}L5nC33N2^`q0qsiAg6{l zC`IBT7=(yb92}%5u7xbg;DKilT#_Y&4pq6qSosJx2NEzSIXD;Zv zApkC2SPb3y=aJpROr<6wjkZX@{{9#Coxdmwcy;-T*jFq7;N9J_2XHyRf^wXo?@D!0 zjzhUz24MAO$y*v75(^MN!Vm2&X01By{#Q1#)6@%j2H*SC3wbuO)4Y24h$DMO*jzX( zP7cCV7B#iaSW-L z^LCcKhjgIK@%__nvIAaCa&zg?oZ)oq;3S>40CrW^g%Jh1g)64y$zF0jvQ=rJ39rZX zG7s%9=TpSn`If3p5H1d46@3*T-tOfV%d?NKs9k*hv$&#Xg}7E~ucvGJ*nTPA zaXo$2elA9vud{DB>t-@EByBwLHN~{F_x0D_BbTq3uH#=47PCAfs=@Ku!z|CkHEE0t z53=|39h10zDq4o&nK5^O_pG-o4@f))N}k#-%FqyYPiSA0OTini7yRE6HRPBXzWn;j z(6F$A=kLLNZI7m&mKJ{$%j(M=pdm8lPmo;WI|hb?PX}u+n-`Rc=7jl+T7NWKz1*u# zGk?n3N0y$KnM#fd|M;M`T;`u83xiCE*0T2wB`}7>d}wiXP7o@&$hnTtA3e7^|&C@28sUIo9p>43|NB>GTNCNXRo?F zzb;4X{Mj=~vVAvpOe!R3%9@L5e)0^ zXK<+Cia0v^&(3#0M1W!VIX~un{@rK4FRlpW%gs^voqhbpVLzv>AAcO?Ts-IWzL2cj zF>a?>SKOYtfZ^<=O|uuoMtx&Z(xSl`PYwGoD@om}b8MZEQ)XiL0>bCVq><#;ZxeU8x=gasqSZqFT z`TWGwqKsr&8_QV&n;yriH=H|hqa|^EdsWqs4|@acMEVm`au%JNnHHn&urMIt%UOv7 zuD|!#-%w9EzT2;1T?NzX)A1s;k6WkK>LnfDenqmVDeu0i``e1^wrq{R%Kr2(wVALr z{rK)Yt{WR4FPHPZx$SYRH7i5?eQ$JL64p>d(~|>{yx@{xNkunml=N>*{`B Pu43?X^>bP0l+XkKulAaG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d49e2d0c0691ab739e4b4f8e7c796f4b115eb6eb GIT binary patch literal 927 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json new file mode 100644 index 00000000000..487754cf9d5 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original BrigMed suit by PuroSlavKing (github) for SS14 | Resprited by H\u00FClle#2562 (Discord), monkey derivative made by brainfood1183 (github) for ss14 | Resprited by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file From 7b83a79e7ea9e7c0fd1aafdacfeba94f16e27ce5 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Wed, 20 Sep 2023 18:13:54 -0500 Subject: [PATCH 02/12] webbing yml moment --- .../Prototypes/Entities/Clothing/Belt/belts.yml | 12 ++++++++++++ .../arcadia-webbing.rsi}/equipped-OUTERCLOTHING.png | Bin .../arcadia-webbing.rsi}/icon.png | Bin .../arcadia-webbing.rsi}/inhand-left.png | Bin .../arcadia-webbing.rsi}/inhand-right.png | Bin .../arcadia-webbing.rsi}/meta.json | 0 6 files changed, 12 insertions(+) rename Resources/Textures/Clothing/{OuterClothing/Vests/arcadia-combatvest.rsi => Belt/arcadia-webbing.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/Clothing/{OuterClothing/Vests/arcadia-combatvest.rsi => Belt/arcadia-webbing.rsi}/icon.png (100%) rename Resources/Textures/Clothing/{OuterClothing/Vests/arcadia-combatvest.rsi => Belt/arcadia-webbing.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/{OuterClothing/Vests/arcadia-combatvest.rsi => Belt/arcadia-webbing.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/{OuterClothing/Vests/arcadia-combatvest.rsi => Belt/arcadia-webbing.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index fa1a5e951fa..d7c3bf5755e 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -563,3 +563,15 @@ whitelist: tags: - WizardWand + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltArcadia + description: A vest belt created by Arcadia Industries. Seems very capable of fitting many items. + components: +- type: Sprite + sprite: Clothing/Belt/arcadia-webbing.rsi +- type: Clothing + sprite: Clothing/Belt/arcadia-webbing.rsi +- type: Storage + capacity: 60 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/icon.png b/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/icon.png rename to Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-left.png rename to Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/inhand-right.png rename to Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/meta.json b/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/arcadia-combatvest.rsi/meta.json rename to Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/meta.json From 610b47fab2ca437325203070a3b39eb222de0575 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Wed, 20 Sep 2023 18:26:40 -0500 Subject: [PATCH 03/12] hood fix? --- .../Head/Hoods/Coat/hoodarcadia.rsi/meta.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json index 69a56daaeab..cd740082fa8 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json @@ -1,18 +1,18 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "By Gotimanga for SS14 | Modified by AjexRose for NewFrontier", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Gotimanga for SS14 | Modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} From 2876ad1bbcaf7ea45b0f705d456994de826a8cd0 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Wed, 20 Sep 2023 22:45:30 -0500 Subject: [PATCH 04/12] adds stuff to prepare for vendor + fixed some missing names/ids --- .../advertisements/vending/arcadiadrobe.ftl | 32 +++++++++++++++++ .../Advertisements/arcadiadrobe.yml | 34 +++++++++++++++++++ .../Inventories/arcadiadrobe.yml | 17 ++++++++++ .../Entities/Clothing/Back/backpacks.yml | 1 + .../Entities/Clothing/Belt/belts.yml | 3 +- .../Entities/Clothing/Hands/gloves.yml | 1 + 6 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/advertisements/vending/arcadiadrobe.ftl create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml diff --git a/Resources/Locale/en-US/advertisements/vending/arcadiadrobe.ftl b/Resources/Locale/en-US/advertisements/vending/arcadiadrobe.ftl new file mode 100644 index 00000000000..3ea4b72173d --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/arcadiadrobe.ftl @@ -0,0 +1,32 @@ +advertisement-arcadiadrobe-1 = Brand new outfits! +advertisement-arcadiadrobe-2 = Roof-top outfits for any occasion! +advertisement-arcadiadrobe-3 = Being a warrior can be stylish. +advertisement-arcadiadrobe-4 = According to the analysis: by dressing more stylishly, the chance of success of your actions increases by 0.0098%! +advertisement-arcadiadrobe-5 = Hey, it seems to me you haven't looked at my assortment for a long time! +advertisement-arcadiadrobe-6 = A BETTER TOMORROW FORGED TODAY! +advertisement-arcadiadrobe-7 = Hey handsome and or pretty stranger, take a gander at our wares! +advertisement-arcadiadrobe-8 = The truth is told — it's not the bullet that kills, but the lack of style. +advertisement-arcadiadrobe-9 = Before the battle of the body, there is the battle of the mind. You can always win that battle with our apparel. +advertisement-arcadiadrobe-10 = Dress with style as you stand atop the corpses of your foes. +advertisement-arcadiadrobe-11 = If you're not wearing our apparel, then your outfit sucks! +advertisement-arcadiadrobe-12 = You can transfer enemies to your side by dressing them in the best outfits in the universe! +advertisement-arcadiadrobe-13 = ...project Eylsium is under way... is that mic on? +advertisement-arcadiadrobe-14 = Wake up, Arc. We need you to record more lines. +advertisement-arcadiadrobe-15 = Hey! Study the unknown in style! +advertisement-arcadiadrobe-16 = Have you always dreamed of dressing stylishly? Then come quickly! +advertisement-arcadiadrobe-17 = I quote the great writer: "Look at my assortment of clothing assortment" +advertisement-arcadiadrobe-18 = According to the scan of the area - you need our top of the line apparel! +advertisement-arcadiadrobe-19 = Have you dreamed of dressing stylishly? Then you come to us! +advertisement-arcadiadrobe-20 = What could be better than new clothes from ArcadiaDrobe! +advertisement-arcadiadrobe-21 = Frighten everyone with your appearance only in our clothes! +advertisement-arcadiadrobe-22 = This isnt the gun vendor. +advertisement-arcadiadrobe-23 = We are not responsible for increased aggression towards our uniforms. +advertisement-arcadiadrobe-24 = Who said functionality and design had to be seperate? +advertisement-arcadiadrobe-25 = The best fibers in the Nexus! +advertisement-arcadiadrobe-26 = Our uniforms are white, to let you paint them with your enemy's blood! +advertisement-arcadiadrobe-27 = 10 out of 10 Realities call our apparel top of the line! +advertisement-arcadiadrobe-28 = Our suits are moisture-resistant, which means you can not be afraid to get dirty with blood! +advertisement-arcadiadrobe-29 = The best in the galaxy! +advertisement-arcadiadrobe-30 = What could be better than the smell of our uniform in the morning? +advertisement-arcadiadrobe-31 = Can you turn off that mic, Duke? Really dont want unauthorized knowledge of Elysium. + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml new file mode 100644 index 00000000000..af94fe188ae --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml @@ -0,0 +1,34 @@ +- type: advertisementsPack + id: ArcadiaDrobeAds + advertisements: + - advertisement-arcadiadrobe-1 + - advertisement-arcadiadrobe-2 + - advertisement-arcadiadrobe-3 + - advertisement-arcadiadrobe-4 + - advertisement-arcadiadrobe-5 + - advertisement-arcadiadrobe-6 + - advertisement-arcadiadrobe-7 + - advertisement-arcadiadrobe-8 + - advertisement-arcadiadrobe-9 + - advertisement-arcadiadrobe-10 + - advertisement-arcadiadrobe-11 + - advertisement-arcadiadrobe-12 + - advertisement-arcadiadrobe-13 + - advertisement-arcadiadrobe-14 + - advertisement-arcadiadrobe-15 + - advertisement-arcadiadrobe-16 + - advertisement-arcadiadrobe-17 + - advertisement-arcadiadrobe-18 + - advertisement-arcadiadrobe-19 + - advertisement-arcadiadrobe-20 + - advertisement-arcadiadrobe-21 + - advertisement-arcadiadrobe-22 + - advertisement-arcadiadrobe-23 + - advertisement-arcadiadrobe-24 + - advertisement-arcadiadrobe-25 + - advertisement-arcadiadrobe-26 + - advertisement-arcadiadrobe-27 + - advertisement-arcadiadrobe-28 + - advertisement-arcadiadrobe-29 + - advertisement-arcadiadrobe-30 + - advertisement-arcadiadrobe-31 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml new file mode 100644 index 00000000000..2009af865fe --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml @@ -0,0 +1,17 @@ +- type: vendingMachineInventory + id: ArcadiaDrobeInventory + startingInventory: + ClothingBackpackArcadia: 3 + ClothingBackpackDuffelArcadia: 3 + ClothingBackpackSatchelArcadia: 3 + ClothingBeltArcadia: 3 + ClothingEyesArcadiaVisor: 3 + ClothingHandsGlovesArcadiaCombat: 3 + ClothingMaskArcadia: 3 + ClothingOuterWinterArcadia: 3 + ClothingUniformJumpskirtArcadia: 5 + ClothingUniformJumpsuitArcadia: 5 + emaggedInventory: + ClothingHeadHatTacticalMaidHeadband: 5 + ClothingUniformJumpskirtTacticalMaid: 5 + ClothingHandsTacticalMaidGloves: 5 diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 9b635d6c716..9baf971e076 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -276,6 +276,7 @@ - type: entity parent: ClothingBackpack + id: ClothingBackpackArcadia name: arcadia backpack description: A backpack produced by Arcadia Industries components: diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index d7c3bf5755e..fe059d8f4e4 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -567,7 +567,8 @@ - type: entity parent: ClothingBeltStorageBase id: ClothingBeltArcadia - description: A vest belt created by Arcadia Industries. Seems very capable of fitting many items. + name: arcadia webbing + description: A webbing created by Arcadia Industries. Seems very capable of fitting many items. components: - type: Sprite sprite: Clothing/Belt/arcadia-webbing.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 817ba31a494..cdee9c9bcd3 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -389,6 +389,7 @@ - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesArcadiaCombat + name: arcadia combat gloves description: Combat gloves produced by Arcadia Industries. components: - type: Sprite From a69806832a8bbc86561961fabaebcc73d429ec37 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Thu, 21 Sep 2023 07:48:31 -0500 Subject: [PATCH 05/12] vendor yml and preparing the sprites --- .../Structures/Machines/vending_machines.yml | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 7d3f04674ef..03d73d36b37 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -61,7 +61,7 @@ radius: 1.5 energy: 1.6 color: "#4b93ad" - + - type: entity parent: VendingMachine id: VendingMachineCircuitVend @@ -135,7 +135,7 @@ color: "#ad2c2b" - type: MarketModifier mod: 50 - + - type: entity parent: VendingMachine id: VendingMachineBountyVend @@ -166,3 +166,37 @@ radius: 1.5 energy: 1.6 color: "#4b93ad" + +- type: entity + parent: VendingMachine + id: VendingMachineArcadia + name: ArcadiaDrobe + description: Selling clothes from another reality for cheap prices! + components: + - type: VendingMachine + pack: ArcadiaDrobeInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + screenState: screen + ejectDelay: 3 + - type: Advertise + pack: ArcadiaDrobeAds + - type: Sprite + sprite: _NF/Structures/arcadiadrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#ff033e" From ebd04db405746e32d2398055899ea27d6b9e4126 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Thu, 21 Sep 2023 09:28:35 -0500 Subject: [PATCH 06/12] vendor sprites --- .../Inventories/arcadiadrobe.yml | 6 ++-- .../Structures/Machines/vending_machines.yml | 2 +- .../Structures/arcadiadrobe.rsi/broken.png | Bin 0 -> 383 bytes .../_NF/Structures/arcadiadrobe.rsi/meta.json | 33 ++++++++++++++++++ .../arcadiadrobe.rsi/normal-unshaded.png | Bin 0 -> 2902 bytes .../_NF/Structures/arcadiadrobe.rsi/off.png | Bin 0 -> 273 bytes .../_NF/Structures/arcadiadrobe.rsi/panel.png | Bin 0 -> 203 bytes 7 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/arcadiadrobe.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/arcadiadrobe.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/arcadiadrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/arcadiadrobe.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/arcadiadrobe.rsi/panel.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml index 2009af865fe..6e71c4db23d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml @@ -12,6 +12,6 @@ ClothingUniformJumpskirtArcadia: 5 ClothingUniformJumpsuitArcadia: 5 emaggedInventory: - ClothingHeadHatTacticalMaidHeadband: 5 - ClothingUniformJumpskirtTacticalMaid: 5 - ClothingHandsTacticalMaidGloves: 5 + ClothingHeadHatTacticalMaidHeadband: 3 + ClothingUniformJumpskirtTacticalMaid: 3 + ClothingHandsTacticalMaidGloves: 3 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 03d73d36b37..bccdb5f018c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -180,7 +180,7 @@ offState: off brokenState: broken normalState: normal-unshaded - ejectState: eject-unshaded + # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples denyState: deny-unshaded screenState: screen ejectDelay: 3 diff --git a/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/broken.png b/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..c713a11337faef31ebf6ef695438ef3ad090e0e5 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|Yyx~jTq_F; z|NsAgeCN(@@7~=wcu-hWWaZqsle@d`oIbg7*7V6ujql#QyRuxSIEWLdAlN-1F(JXt z&28$`sXzmw1Km7;lt@XCUog-Rbim;6|6C9#f6>#$F~p+x?Bt7lO$I!!juP9~MmhZd zAHO%Xlkr+c&1W_aPyY0`V!P6pcn5oby%|62%YSyBzXIWBztyoEyJjHQcqRzKL^3WhoZfYM5>tP9P(o~3Wc_=^lZ-#UmDiu(PK(uySJH140(y?Y M)78&qol`;+03eB~8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/meta.json b/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/meta.json new file mode 100644 index 00000000000..9deed42e948 --- /dev/null +++ b/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062 modified by Potato1234x (Github) for SS14 | slightly modified by AjexRose for NewFrontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 1.0, + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..c541f4937e7658c383375543508c958a04789bac GIT binary patch literal 2902 zcmV-c3#s&pP)EX>4Tx04R}tkv&MmKpe$iQ^gOe4rUN>$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=9*&~)2O z#-dUtyDD|PLO>5hM9?oY%ZR5I)9@W%_XzOyF2b|?&;2?2)SShDfJ8jU4AUmwAfDN@ z4bJ<-A}h)&@j3ChNf#u3*o ztDLtuYvn3y-jlyDl+#yIT&FpL7?u!60umHdQ9>Cu^;LpSiiITYM}7Rmu0KI8g;V-)Dx1sXNS`95}>#t9I72Cnp$zfuQgKS{5( zwD1uyunk;Xw=`uBxZDATo($QPT`5RY$mfCgGy0}1Fn9~}u6eyR_i_3Fq^Yar8{ps& z7%Ncry3f12+k5->OtZfqa3FG~AWI@t000S%NklTkdQa( zDRxAR$WZzgl+j9bSYr`|3QUIDnT3gpfKsvXQnU@N<;zsqCZ@5dbdyq&u4tvriVz7* z)Tl1dty8h0IB64YWH?bEm4$*`2OBbnlAe7??#;c<3)hZ=LU(^(a(&L@bI*PL=iT=S z7#J8B7#J8B7#Pfcwr}4qwr}6AJKbPvq(qEOCX{C+=nyPa2Fd4&T9 z4&e9u0SE;nDX-wy9bH3^$z&3Kzh7~1PHrZlV1#8)mf^kVQ$EXicDtQBckU!Kyd{Fo zW)qX;UAb~)#_l^4=X9hN}HXa51tnwpvb z*j-aY_u<2A0+w}lvb&~+-8D6eZ8REH>?X2R3z;ZO%gaPwULMg~5&V8X^XAP{@_Kr^ zS#jwy&h~a?Ud+qOBQGyc5$$g1UIi5`$d|sm{3!r_vhBy3Jo)q7Z>CYSAU|c!FD@>o zsi}$Dx;h-IR|BvK_+-Zptc8Uf+P`1Z`fKazuof0#EiBa79@@V@DG`>Imx+Z%#q{)c z^XeBj_(fmeI1vE)hKDtudwRQx-inMHvL-^80E-3(n7{Q!U6uaX?j5>qr{aYdUf^j- z(scR4(bX0}h0{re(@9512WGQb=>>ASLnPhkHT3j$v*~gVU7-+w(%R?Eo5#YUVm>Na zgm3B633~{PpEu&s-2=LQe^3DYbmvP1LLp_`4+O3e2!%L!@E`zte|11?$#^i4XPl75 zAAbzMu3fv7wBq98X_uP}atoJ5P_wY8nCPvDG8DCa>f?#W$}rE(q_xE-wYK=AsYK8% zK<|}4tPMwzPMzkxC694#&rZG^8syxboxHc?G5Y@W2G)k7-1={7cfoJH^;SyDOBA`4 z_YDuzH#|)99u9{?$%nC}sod(Paz5x3Kst3A%a2ATT6qru;9IwWvQsA} zw4VvOyStU^4?p}+xqjr4M*!&U?WLomW1Q`DkVOE9-im0P4hr=Oc$0xcM&?Ueh z{FfwL&kKO>9eRx~_x%z8+nayJw{GN6?!o=P;oP2`WA-Ux@7}%2b>GNZ8-Nd*n*rFf zZ=W&&tJ5D`zdlt}xN9p;W&&Q3l~;(2G9Syv$$wE!@(se-ZHt;|F_VP)5>+6gZQ zF&hP#)l`F6uG-!w%W@FaDJW+qnDs3}?g=t_Td`WW#X!R>eb!l7sd&__w`(dx6^m8Z zv(@=9iz_x6dWVwP>~sSI0|NsC0|NsC0|NsC1B3eoBR(Lt+_&)oR;zW~q1@H0SMR$6 zINk4t%JBgJ%bqNwq@;vPmo91I14i@2`=+!R6~St?iq(+_{+l;>E;pCs!65dG4Bod| zMKU5>xNu=w^{L)kqcnzw`ntQ`-{Ej5*Y{m~fYoXhix)4Z2e7xa&=!kf&&Z&syj=bb zASn^oIL|TARK1B%O&a)csEv;0P6UFP%uJHZYJJ~J|#W? z#+*MYj$j7Q>ewN9qsNjo}Cz)SaNtf3cgR@?382ly-?CJ1#3d9e~Zz0btC@EoaZra`p`0S+$C$#zvg3 zD#ZrCJT!!P&K#l-J;YIS7R_60#AI_r((wWDq&hx8FY(TwF4bFW#9W|o&K%4`Lz=wJ z(E&C`2Pj{)hCn!sV9tcjhmrS0kD9Y+ZahZI*)y7nT1`^%0hP~ID6Kvej8OS(1(3S< zfQguB*_ldv7@JVvDX=In+M0)kCKSTys#30H)Xv}6-i~^5o=k*U8y|45k)0n1hiPs+ z#=iD;Ue7Ji2%$!H{J`L#B2wS*FclsT``X(Hgu?{FVJz9%RBqfjsR*++K43B~TP*l* z-lQ#VoR=ry%N9$*Wp3NHO>w@{RfQ!xTO&k;$3x%nu;S=}!9o6#nMp%^ozz@lp~B-~ zb89PG&YxF$hT8F7x104Y7lCk?2c)kw_nuaKKp+&F@%R84d18&lVu}dIgF)J2F^&g= ziu2WWdihE`pg2EX2mq(6iY@2Qv$?gE3Xg~80*huZptggNAqT+gb}J$@H8xVYaiivY zkl-q)?9>Tts(650k6T%G+8EiS{r$B+CQ_ts`uqE({QP{8mX^k%KtOSJ2f+OK#HaW7 z_v@aE8tUsLd0D9z0>+#vr^(Kikr*CVR^`Tx;^e#UV#&_N>vmJVY7Nbe$M{N&Z|}N$ zKwf?xp3{#Ow7c<9{-n zuu-Qe6Xayhk9W2ZLK%A0wsNnEPmkxmJ3R!*&(9YRf9qkwp|CRSWanfP4uz9)e*9sa zyi$pGT%w0=lc7G0GcYhPFfcGMFfcGMFu2G35ACS)1FQr9RsaA107*qoM6N<$fxie!SP^#S1#WBR9_wD41Tn!35442P_X8ryDysh`r&crX*oZCAd6!IL& z)b~-VIlB8Z*LPb+nJGu-q-!qFTOiWp#3i!AZNjru-YcRP;)NUBS2qMW#=d9?lHjUu zY?a_$Sl=Bdus)NMOLfVe2|kIt4O{0(efllQ)AHfVZgv@^MKayG7e18&oxtGf>gTe~ HDWM4f{dIC! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/panel.png b/Resources/Textures/_NF/Structures/arcadiadrobe.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..33f9ed5033a0b1d2e9403060c53ada57cf78899a GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY;~ z2@TD@E@bvU_ zNvA($#wnr(!Xc+!xY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`n tt4B%rOPnz=`)6-p#&6~hvQUMA!DX(L(7L;d?|=?s@O1TaS?83{1OWbLM9TmG literal 0 HcmV?d00001 From b73705b3b98113f562cd94e8b6ee442ce1929386 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Fri, 22 Sep 2023 15:12:06 -0500 Subject: [PATCH 07/12] Migrated all textures and hopefully all ymls to _NF --- .../Advertisements/arcadiadrobe.yml | 0 .../Inventories/arcadiadrobe.yml | 0 .../_NF/Entities/Clothing/Back/backpacks.yml | 8 ++++++++ .../_NF/Entities/Clothing/Back/duffel.yml | 8 ++++++++ .../_NF/Entities/Clothing/Back/satchel.yml | 8 ++++++++ .../_NF/Entities/Clothing/Belt/belts.yml | 12 +++++++++++ .../_NF/Entities/Clothing/Eyes/glasses.yml | 14 +++++++++++++ .../_NF/Entities/Clothing/Hands/gloves.yml | 17 ++++++++++++++++ .../_NF/Entities/Clothing/Head/hoods.yml | 10 +++++++++ .../_NF/Entities/Clothing/Masks/masks.yml | 19 ++++++++++++++++++ .../Clothing/OuterClothing/wintercoats.yml | 17 ++++++++++++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 +++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 10 +++++++++ .../equipped-BACKPACK.png | Bin .../Backpacks/arcadia-backpack.rsi/icon.png | Bin .../arcadia-backpack.rsi/inhand-left.png | Bin .../arcadia-backpack.rsi/inhand-right.png | Bin .../Backpacks/arcadia-backpack.rsi/meta.json | 0 .../equipped-BACKPACK.png | Bin .../Duffels/arcadia-dufflebag.rsi/icon.png | Bin .../arcadia-dufflebag.rsi/inhand-left.png | Bin .../arcadia-dufflebag.rsi/inhand-right.png | Bin .../Duffels/arcadia-dufflebag.rsi/meta.json | 0 .../arcadia-satchel.rsi/equipped-BACKPACK.png | Bin .../Satchels/arcadia-satchel.rsi/icon.png | Bin .../arcadia-satchel.rsi/inhand-left.png | Bin .../arcadia-satchel.rsi/inhand-right.png | Bin .../Satchels/arcadia-satchel.rsi/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin .../Belt/arcadia-webbing.rsi/icon.png | Bin .../Belt/arcadia-webbing.rsi/inhand-left.png | Bin .../Belt/arcadia-webbing.rsi/inhand-right.png | Bin .../Belt/arcadia-webbing.rsi/meta.json | 0 .../arcadiavisor.rsi/equipped-EYES.png | Bin .../Eyes/Glasses/arcadiavisor.rsi/icon.png | Bin .../Glasses/arcadiavisor.rsi/inhand-left.png | Bin .../Glasses/arcadiavisor.rsi/inhand-right.png | Bin .../Eyes/Glasses/arcadiavisor.rsi/meta.json | 0 .../equipped-HAND.png | Bin .../Gloves/arcadia-combatgloves.rsi/icon.png | Bin .../arcadia-combatgloves.rsi/inhand-left.png | Bin .../arcadia-combatgloves.rsi/inhand-right.png | Bin .../Gloves/arcadia-combatgloves.rsi/meta.json | 0 .../Coat/hoodarcadia.rsi/equipped-HELMET.png | Bin .../Head/Hoods/Coat/hoodarcadia.rsi/icon.png | Bin .../Head/Hoods/Coat/hoodarcadia.rsi/meta.json | 0 .../arcadia-battleface.rsi/equipped-MASK.png | Bin .../Masks}/arcadia-battleface.rsi/icon.png | Bin .../arcadia-battleface.rsi/inhand-left.png | Bin .../arcadia-battleface.rsi/inhand-right.png | Bin .../Masks}/arcadia-battleface.rsi/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin .../WinterCoats/coatarcadia.rsi/icon.png | Bin .../coatarcadia.rsi/inhand-left.png | Bin .../coatarcadia.rsi/inhand-right.png | Bin .../WinterCoats/coatarcadia.rsi/meta.json | 0 .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../Jumpskirt/arcadia-jumpskirt.rsi/icon.png | Bin .../arcadia-jumpskirt.rsi/inhand-left.png | Bin .../arcadia-jumpskirt.rsi/inhand-right.png | Bin .../Jumpskirt/arcadia-jumpskirt.rsi/meta.json | 0 .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../Jumpsuit/arcadia-jumpsuit.rsi/icon.png | Bin .../arcadia-jumpsuit.rsi/inhand-left.png | Bin .../arcadia-jumpsuit.rsi/inhand-right.png | Bin .../Jumpsuit/arcadia-jumpsuit.rsi/meta.json | 0 68 files changed, 133 insertions(+) rename Resources/Prototypes/{ => _NF}/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml (100%) rename Resources/Prototypes/{ => _NF}/Catalog/VendingMachines/Inventories/arcadiadrobe.yml (100%) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml rename Resources/Textures/{ => _NF}/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Backpacks/arcadia-backpack.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Backpacks/arcadia-backpack.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Duffels/arcadia-dufflebag.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Belt/arcadia-webbing.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Belt/arcadia-webbing.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Eyes/Glasses/arcadiavisor.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/equipped-HAND.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json (100%) rename Resources/Textures/{Clothing/Mask => _NF/Clothing/Masks}/arcadia-battleface.rsi/equipped-MASK.png (100%) rename Resources/Textures/{Clothing/Mask => _NF/Clothing/Masks}/arcadia-battleface.rsi/icon.png (100%) rename Resources/Textures/{Clothing/Mask => _NF/Clothing/Masks}/arcadia-battleface.rsi/inhand-left.png (100%) rename Resources/Textures/{Clothing/Mask => _NF/Clothing/Masks}/arcadia-battleface.rsi/inhand-right.png (100%) rename Resources/Textures/{Clothing/Mask => _NF/Clothing/Masks}/arcadia-battleface.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/{ => _NF}/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml similarity index 100% rename from Resources/Prototypes/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml rename to Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/arcadiadrobe.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml similarity index 100% rename from Resources/Prototypes/Catalog/VendingMachines/Inventories/arcadiadrobe.yml rename to Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml new file mode 100644 index 00000000000..cad7fe218c2 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ClothingBackpack + id: ClothingBackpackArcadia + name: arcadia backpack + description: A backpack produced by Arcadia Industries + components: + - type: Sprite + sprite: _NF/Clothing/Back/Backpacks/arcadia-backpack.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml new file mode 100644 index 00000000000..0ec8ce018fe --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelArcadia + name: arcadia duffel + description: A duffelbag produced by Arcadia Industries + components: + - type: Sprite + sprite: _NF/Clothing/Back/Duffels/arcadia-duffel.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml new file mode 100644 index 00000000000..7635fa37395 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelArcadia + name: arcadia satchel + description: A satchel produced by Arcadia Industries. + components: + - type: Sprite + sprite: _NF/Clothing/Back/Satchels/arcadia-satchel.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..419c55cf0f0 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,12 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltArcadia + name: arcadia webbing + description: A webbing created by Arcadia Industries. Seems very capable of fitting many items. + components: +- type: Sprite + sprite: _NF/Clothing/Belt/arcadia-webbing.rsi +- type: Clothing + sprite: _NF/Clothing/Belt/arcadia-webbing.rsi +- type: Storage + capacity: 60 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml new file mode 100644 index 00000000000..49a2e27650f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingEyesBase + id: ClothingEyesArcadiaVisor + name: arcadia visor + description: A visor produced by Arcadia Industries, with some high tech optics systems built in. + components: + - type: Sprite + sprite: _NF/Clothing/Eyes/Glasses/arcadiavisor.rsi + - type: Clothing + sprite: _NF/Clothing/Eyes/Glasses/arcadiavisor.rsi + - type: FlashImmunity + - type: EyeProtection + - type: VisionCorrection + - type: IdentityBlocker diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 00000000000..edb1365b880 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,17 @@ +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesArcadiaCombat + name: arcadia combat gloves + description: Combat gloves produced by Arcadia Industries. + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-black + - type: FingerprintMask diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..aae9a637c5d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodArcadia + noSpawn: true + name: arcadia coat hood + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml new file mode 100644 index 00000000000..bc60cf54867 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingMaskBase + id: ClothingMaskArcadia + name: arcadia battle mask + description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers. + components: + - type: Sprite + sprite: _NF/Clothing/Mask/arcadia-battleface.rsi + - type: Clothing + sprite: _NF/Clothing/Mask/arcadia-battleface.rsi + - type: BreathMask + - type: IdentityBlocker + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.90 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml new file mode 100644 index 00000000000..59ef3a28784 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wintercoats.yml @@ -0,0 +1,17 @@ +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterArcadia + name: arcadia winter coat + description: A coat produced by Arcadia Industries, seems soft. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodArcadia + - type: Armor + modifiers: + coefficients: + Heat: 0.75 + Caustic: 0.9 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml new file mode 100644 index 00000000000..abdd1eb660e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtArcadia + name: arcadia jumpskirt + description: A jumpskirt produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml new file mode 100644 index 00000000000..9022676028f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitArcadia + name: arcadia jumpsuit + description: A jumpsuit produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi diff --git a/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Back/Backpacks/arcadia-backpack.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Backpacks/arcadia-backpack.rsi/meta.json diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi/meta.json diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/icon.png diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Back/Satchels/arcadia-satchel.rsi/meta.json diff --git a/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/icon.png b/Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/icon.png diff --git a/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Belt/arcadia-webbing.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Belt/arcadia-webbing.rsi/meta.json diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png rename to Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/equipped-EYES.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/icon.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/arcadiavisor.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Eyes/Glasses/arcadiavisor.rsi/meta.json diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/equipped-HAND.png rename to Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/equipped-HAND.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/icon.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png rename to Resources/Textures/_NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/icon.png diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi/meta.json diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/equipped-MASK.png b/Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/equipped-MASK.png rename to Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/equipped-MASK.png diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/icon.png b/Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/icon.png diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/meta.json b/Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Mask/arcadia-battleface.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Masks/arcadia-battleface.rsi/meta.json diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/icon.png rename to Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/meta.json rename to Resources/Textures/_NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-left.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-right.png rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json rename to Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi/meta.json From e3503fe072838efabb53063d5ccbee6c48013632 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Fri, 22 Sep 2023 15:16:01 -0500 Subject: [PATCH 08/12] Arcadia clothes are no longer in upstream ymls, Wizards appeased --- .../Entities/Clothing/Back/backpacks.yml | 9 --------- .../Entities/Clothing/Back/duffel.yml | 9 --------- .../Entities/Clothing/Back/satchel.yml | 9 --------- .../Entities/Clothing/Belt/belts.yml | 13 ------------ .../Entities/Clothing/Eyes/glasses.yml | 15 -------------- .../Entities/Clothing/Hands/gloves.yml | 18 ----------------- .../Entities/Clothing/Head/hoods.yml | 11 ---------- .../Entities/Clothing/Masks/masks.yml | 20 ------------------- .../Clothing/OuterClothing/wintercoats.yml | 18 ----------------- .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ---------- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ---------- 11 files changed, 144 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 9baf971e076..96c87d721cf 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -273,12 +273,3 @@ sprite: Clothing/Back/Backpacks/cluwne.rsi - type: Unremoveable deleteOnDrop: false - -- type: entity - parent: ClothingBackpack - id: ClothingBackpackArcadia - name: arcadia backpack - description: A backpack produced by Arcadia Industries - components: - - type: Sprite - sprite: Clothing/Back/Backpacks/arcadia-backpack.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 4d95b4ac933..b9cc9ca2663 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -232,12 +232,3 @@ capacity: 9999 - type: ClothingSpeedModifier sprintModifier: 1 # makes its stats identical to other variants of bag of holding - -- type: entity - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelArcadia - name: arcadia duffel - description: A duffelbag produced by Arcadia Industries - components: - - type: Sprite - sprite: Clothing/Back/Duffels/arcadia-duffel.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 3d5a1a694a8..e80b0d6f8b2 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -169,12 +169,3 @@ shader: unshaded - type: Storage capacity: 9999 - -- type: entity - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelArcadia - name: arcadia satchel - description: A satchel produced by Arcadia Industries. - components: - - type: Sprite - sprite: Clothing/Back/Satchels/arcadia-satchel.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index fe059d8f4e4..fa1a5e951fa 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -563,16 +563,3 @@ whitelist: tags: - WizardWand - -- type: entity - parent: ClothingBeltStorageBase - id: ClothingBeltArcadia - name: arcadia webbing - description: A webbing created by Arcadia Industries. Seems very capable of fitting many items. - components: -- type: Sprite - sprite: Clothing/Belt/arcadia-webbing.rsi -- type: Clothing - sprite: Clothing/Belt/arcadia-webbing.rsi -- type: Storage - capacity: 60 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index ad448d047fd..bca32d99670 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -188,18 +188,3 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesArcadiaVisor - name: arcadia visor - description: A visor produced by Arcadia Industries, with some high tech optics systems built in. - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/arcadiavisor.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/arcadiavisor.rsi - - type: FlashImmunity - - type: EyeProtection - - type: VisionCorrection - - type: IdentityBlocker diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index cdee9c9bcd3..8b76554f929 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -385,21 +385,3 @@ - type: GuideHelp guides: - DNA - -- type: entity - parent: ClothingHandsBase - id: ClothingHandsGlovesArcadiaCombat - name: arcadia combat gloves - description: Combat gloves produced by Arcadia Industries. - components: - - type: Sprite - sprite: Clothing/Hands/Gloves/arcadia-combatgloves.rsi - - type: Clothing - sprite: Clothing/Hands/Gloves/arcadia-combatgloves.rsi - - type: GloveHeatResistance - heatResistance: 1400 - - type: Insulated - - type: Fiber - fiberMaterial: fibers-synthetic - fiberColor: fibers-black - - type: FingerprintMask diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 620aeedc80a..38bfcc879dc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -465,14 +465,3 @@ sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi - -- type: entity - parent: ClothingHeadHatHoodWinterBase - id: ClothingHeadHatHoodArcadia - noSpawn: true - name: arcadia coat hood - components: - - type: Sprite - sprite: Clothing/Head/Hoods/Coat/hoodarcadia.rsi - - type: Clothing - sprite: Clothing/Head/Hoods/Coat/hoodarcadia.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index afb9cb1c991..1d2f1fb2ce8 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -505,23 +505,3 @@ - type: EyeProtection - type: BreathMask - type: IdentityBlocker - -- type: entity - parent: ClothingMaskBase - id: ClothingMaskArcadia - name: arcadia battle mask - description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers. - components: - - type: Sprite - sprite: Clothing/Mask/arcadia-battleface.rsi - - type: Clothing - sprite: Clothing/Mask/arcadia-battleface.rsi - - type: BreathMask - - type: IdentityBlocker - - type: Armor - modifiers: - coefficients: - Blunt: 0.80 - Slash: 0.80 - Piercing: 0.90 - Heat: 0.90 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 707a5f84f1e..bf3949739ed 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -508,21 +508,3 @@ Quantity: 20 - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWeb - -- type: entity - parent: ClothingOuterWinterCoatToggleable - id: ClothingOuterWinterArcadia - name: arcadia winter coat - description: A coat produced by Arcadia Industries, seems soft. - components: - - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatarcadia.rsi - - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatarcadia.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHatHoodArcadia - - type: Armor - modifiers: - coefficients: - Heat: 0.75 - Caustic: 0.9 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 146c427ce9e..3cfc8228348 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -812,14 +812,3 @@ - type: Construction graph: WebObjects node: jumpskirt - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtArcadia - name: arcadia jumpskirt - description: A jumpskirt produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood - components: - - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 6e81ba938d7..7f784bbf99e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1301,14 +1301,3 @@ - type: Construction graph: WebObjects node: jumpsuit - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitArcadia - name: arcadia jumpsuit - description: A jumpsuit produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood - components: - - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi From fd7aa1aa7ccf92eac9211eb0b86a69877f888802 Mon Sep 17 00:00:00 2001 From: AjexRose Date: Wed, 27 Sep 2023 07:50:45 -0500 Subject: [PATCH 09/12] fixes yml formatting + temp adds ArcadiaDrobe to the salvage rewards --- Resources/Prototypes/Procedural/salvage_rewards.yml | 2 +- .../Prototypes/_NF/Entities/Clothing/Back/duffel.yml | 4 ++-- .../Prototypes/_NF/Entities/Clothing/Belt/belts.yml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index e96d4702137..30016ab4833 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -66,7 +66,7 @@ CratePirateChest: 0.5 ClothingOuterArmorReflective: 0.5 MoneyTreeSeeds: 0.5 - + VendingMachineArcadia: 0.5 - type: weightedRandomEntity id: SalvageRewardEpic diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index 0ec8ce018fe..b86eb7f1e61 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -4,5 +4,5 @@ name: arcadia duffel description: A duffelbag produced by Arcadia Industries components: - - type: Sprite - sprite: _NF/Clothing/Back/Duffels/arcadia-duffel.rsi + - type: Sprite + sprite: _NF/Clothing/Back/Duffels/arcadia-duffel.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml index 419c55cf0f0..39660c6077d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -4,9 +4,9 @@ name: arcadia webbing description: A webbing created by Arcadia Industries. Seems very capable of fitting many items. components: -- type: Sprite - sprite: _NF/Clothing/Belt/arcadia-webbing.rsi -- type: Clothing - sprite: _NF/Clothing/Belt/arcadia-webbing.rsi -- type: Storage - capacity: 60 + - type: Sprite + sprite: _NF/Clothing/Belt/arcadia-webbing.rsi + - type: Clothing + sprite: _NF/Clothing/Belt/arcadia-webbing.rsi + - type: Storage + capacity: 60 From f8ff55930045a2ad88c9ce838132c4972c7006bc Mon Sep 17 00:00:00 2001 From: AjexRose Date: Wed, 27 Sep 2023 08:02:26 -0500 Subject: [PATCH 10/12] fixes conflict in salvage rewards maybe --- .../Prototypes/Procedural/salvage_rewards.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 30016ab4833..816e5374e04 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -13,12 +13,16 @@ CrateFunATV: 0.25 CrateFunInstrumentsVariety: 0.25 CrateSalvageEquipment: 0.25 - RandomArtifactSpawner: 0.25 + #RandomArtifactSpawner: 0.25 # weighted down since it sells for a lot NuclearBombKeg: 0.1 # money SpaceCash1000: 0.75 SpaceCash2500: 1.25 + # custom NF14 + CrateFloorsFun: 0.1 + CrateEngineeringJetpack: 0.25 + CrateMaterialTextiles: 1.0 - type: weightedRandomEntity id: SalvageRewardRare @@ -30,7 +34,7 @@ SheetUranium: 1.0 CratePartsT3: 1.0 CratePartsT3T4: 0.5 - TechnologyDiskRare: 0.5 + #TechnologyDiskRare: 0.5 # cloning boards CloningPodMachineCircuitboard: 0.5 MedicalScannerMachineCircuitboard: 0.5 @@ -63,9 +67,10 @@ ScienceTechFabCircuitboard: 1.0 SecurityTechFabCircuitboard: 0.25 MaterialReclaimerMachineCircuitboard: 1.0 - CratePirateChest: 0.5 + CrateFunParty: 0.5 ClothingOuterArmorReflective: 0.5 MoneyTreeSeeds: 0.5 + CrateMedicalSupplies: 0.5 VendingMachineArcadia: 0.5 - type: weightedRandomEntity @@ -93,6 +98,7 @@ # Custom NF EnergySword: 0.5 EnergyDagger: 0.5 - EnergyCutlass: 0.5 + EnergySwordDouble: 0.1 + #EnergyCutlass: 0.5 Claymore: 0.5 WeaponLauncherRocket: 0.5 From d64612ed9d38b9ccc5a5839dd006434fdf070dec Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:59:00 -0400 Subject: [PATCH 11/12] Update masks.yml masks --- Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index bc60cf54867..9b5688dd312 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -5,9 +5,9 @@ description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers. components: - type: Sprite - sprite: _NF/Clothing/Mask/arcadia-battleface.rsi + sprite: _NF/Clothing/Masks/arcadia-battleface.rsi - type: Clothing - sprite: _NF/Clothing/Mask/arcadia-battleface.rsi + sprite: _NF/Clothing/Masks/arcadia-battleface.rsi - type: BreathMask - type: IdentityBlocker - type: Armor From 4700db6331248debf28ec581bc8469cda9f0e2e6 Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Thu, 28 Sep 2023 17:13:42 -0400 Subject: [PATCH 12/12] Update duffel.yml --- Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index b86eb7f1e61..13ffd36b16e 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -5,4 +5,4 @@ description: A duffelbag produced by Arcadia Industries components: - type: Sprite - sprite: _NF/Clothing/Back/Duffels/arcadia-duffel.rsi + sprite: _NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi