From ee540228320c69d1a5f6cbed16df0c0965c96648 Mon Sep 17 00:00:00 2001 From: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:57:10 +0300 Subject: [PATCH] Ash Walker`s spear and uniform (#20292) * bones, gladiators, milk, spear and tears * :trollface: my copy/paste python script did the funny * forgor * fixed * mat.yml fixed * bones * bone armor * gladiator uniform now in clothesmate like ss13 * bone armor craft * pieces * i was dumb in the past, now im dumb too * that was dumb... * fixing stuff * i hate git * Revert "i hate git" This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f. * Revert "fixing stuff" This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3. * this will work? * i fucking merged it --- .../Locale/en-US/materials/materials.ftl | 1 + .../VendingMachines/Inventories/theater.yml | 2 + .../Entities/Clothing/Head/hats.yml | 11 +++++ .../Entities/Clothing/Head/helmets.yml | 15 +++++++ .../Entities/Clothing/OuterClothing/armor.yml | 25 +++++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++ .../Entities/Objects/Materials/materials.yml | 41 ++++++++++++++++++ .../Entities/Objects/Weapons/Melee/spear.yml | 11 +++++ .../Reagents/Materials/materials.yml | 8 ++++ .../Construction/Graphs/clothing/armor.yml | 27 ++++++++++++ .../Construction/Graphs/weapons/spear.yml | 17 ++++++++ .../Recipes/Construction/clothing.yml | 22 ++++++++++ .../Recipes/Construction/weapons.yml | 11 +++++ .../Prototypes/Stacks/Materials/materials.yml | 8 ++++ .../Hats/gladiator.rsi/equipped-HELMET.png | Bin 0 -> 1501 bytes .../Clothing/Head/Hats/gladiator.rsi/icon.png | Bin 0 -> 456 bytes .../Head/Hats/gladiator.rsi/inhand-left.png | Bin 0 -> 658 bytes .../Head/Hats/gladiator.rsi/inhand-right.png | Bin 0 -> 644 bytes .../Head/Hats/gladiator.rsi/meta.json | 26 +++++++++++ .../bone_helmet.rsi/equipped-HELMET.png | Bin 0 -> 1315 bytes .../Head/Helmets/bone_helmet.rsi/icon.png | Bin 0 -> 1433 bytes .../Helmets/bone_helmet.rsi/inhand-left.png | Bin 0 -> 593 bytes .../Helmets/bone_helmet.rsi/inhand-right.png | Bin 0 -> 607 bytes .../Head/Helmets/bone_helmet.rsi/meta.json | 26 +++++++++++ .../bone_armor.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 3567 bytes .../Armor/bone_armor.rsi/icon.png | Bin 0 -> 1004 bytes .../Armor/bone_armor.rsi/inhand-left.png | Bin 0 -> 628 bytes .../Armor/bone_armor.rsi/inhand-right.png | Bin 0 -> 635 bytes .../Armor/bone_armor.rsi/meta.json | 26 +++++++++++ .../gladiator.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 2074 bytes .../Uniforms/Jumpsuit/gladiator.rsi/icon.png | Bin 0 -> 955 bytes .../Uniforms/Jumpsuit/gladiator.rsi/meta.json | 18 ++++++++ .../Objects/Materials/materials.rsi/bones.png | Bin 0 -> 346 bytes .../Materials/materials.rsi/bones_2.png | Bin 0 -> 471 bytes .../Materials/materials.rsi/bones_3.png | Bin 0 -> 588 bytes .../Objects/Materials/materials.rsi/meta.json | 9 ++++ .../bone_spear.rsi/equipped-BACKPACK.png | Bin 0 -> 593 bytes .../Melee/bone_spear.rsi/inhand-left.png | Bin 0 -> 275 bytes .../Melee/bone_spear.rsi/inhand-right.png | Bin 0 -> 268 bytes .../Weapons/Melee/bone_spear.rsi/meta.json | 34 +++++++++++++++ .../Weapons/Melee/bone_spear.rsi/spear.png | Bin 0 -> 187 bytes .../bone_spear.rsi/wielded-inhand-left.png | Bin 0 -> 571 bytes .../bone_spear.rsi/wielded-inhand-right.png | Bin 0 -> 682 bytes 43 files changed, 349 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml create mode 100644 Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/gladiator.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/bones.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/bones_2.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/bones_3.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 12bfcf5e12..abd61d1065 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -22,6 +22,7 @@ materials-uranium = uranium materials-bananium = bananium materials-meat = meat materials-web = silk +materials-bones = bone # Material Reclaimer material-reclaimer-upgrade-process-rate = process rate diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 8476fff464..d4dd657027 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -41,6 +41,8 @@ ClothingUniformJumpsuitKimono: 1 ClothingHeadHatCasa: 1 ClothingHeadHatHairflower: 1 + ClothingHeadHatGladiator: 1 + ClothingUniformJumpsuitGladiator: 1 emaggedInventory: ClothingShoesBling: 1 ClothingOuterDogi: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 922c2cc790..c2ecf0f946 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -777,3 +777,14 @@ - ClothMade - WhitelistChameleon - HamsterWearable + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatGladiator + name: Gladiator helmet + description: Protects the head from harsh ash winds and toy spears. + components: + - type: Sprite + sprite: Clothing/Head/Hats/gladiator.rsi + - type: Clothing + sprite: Clothing/Head/Hats/gladiator.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 576e88a285..c7622e60be 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -336,3 +336,18 @@ sprite: Clothing/Head/Helmets/ert_janitor.rsi - type: Clothing sprite: Clothing/Head/Helmets/ert_janitor.rsi + +#Bone Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetBone + name: bone helmet + description: Cool-looking helmet made of skull of your enemies. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/bone_helmet.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/bone_helmet.rsi + - type: Construction + graph: BoneHelmet + node: helmet diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 666cbc2d20..b66ddc1dff 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -255,3 +255,28 @@ - type: ExplosionResistance damageCoefficient: 0.5 - type: GroupExamine + +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorBone + name: bone armor + description: Sits on you like a second skin. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/bone_armor.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/bone_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.8 + Piercing: 0.4 + - type: ClothingSpeedModifier + walkModifier: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: GroupExamine + - type: Construction + graph: BoneArmor + node: armor diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 1488e27a72..4f1917fe18 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1312,3 +1312,14 @@ sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitGladiator + name: gladiator uniform + description: Made for true gladiators (or Ash Walkers). + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index dd47d3c191..7386eaee4d 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -534,3 +534,44 @@ count: 1 - type: Item size: 1 + +- type: entity + parent: MaterialBase + id: MaterialBones + name: bones + suffix: Full + components: + - type: Stack + stackType: Bones + baseLayer: base + layerStates: + - bones + - bones_2 + - bones_3 + - type: Sprite + state: cotton_3 + layers: + - state: cotton_3 + map: ["base"] + - type: Appearance + - type: Item + size: 30 + - type: Food + - type: BadFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Vitamin + Quantity: 3 + +- type: entity + parent: MaterialBones + id: MaterialBones1 + suffix: 1 + components: + - type: Stack + count: 1 + - type: Item + size: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index ea25cf0db8..bbd4d2389d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -166,3 +166,14 @@ Radiation: 9 - type: Construction graph: SpearUranium + +- type: entity + name: bone spear + parent: Spear + id: SpearBone + description: A spear made of bones. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/bone_spear.rsi + - type: Construction + graph: SpearBone diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index 6603350806..4c94798dbf 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -91,3 +91,11 @@ icon: { sprite: Objects/Materials/silk.rsi, state: icon } color: "#eeeeee" #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee price: 0 # Maybe better for it to be priceless, knowing how greedy cargo is. + +- type: material + id: Bones + name: materials-bones + unit: materials-unit-piece + icon: { sprite: Objects/Materials/materials.rsi, state: bones } + color: "#896f5e" + price: 0 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml new file mode 100644 index 0000000000..e597d7cdc4 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: BoneArmor + start: start + graph: + - node: start + edges: + - to: armor + steps: + - material: Bones + amount: 6 + doAfter: 2 + - node: armor + entity: ClothingOuterArmorBone + +- type: constructionGraph + id: BoneHelmet + start: start + graph: + - node: start + edges: + - to: helmet + steps: + - material: Bones + amount: 4 + doAfter: 1 + - node: helmet + entity: ClothingHeadHelmetBone diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml index c680662ccb..6e1c682f47 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml @@ -89,3 +89,20 @@ doAfter: 1 - node: spear entity: SpearUranium + +- type: constructionGraph + id: SpearBone + start: start + graph: + - node: start + edges: + - to: spear + steps: + - material: Bones + amount: 4 + doAfter: 2 + - material: WebSilk + amount: 1 + doAfter: 1 + - node: spear + entity: SpearBone diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 796ab78642..e8bd1b6938 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -8,3 +8,25 @@ description: A modified hardsuit fit for a clown. icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon } objectType: Item + +- type: construction + name: bone armor + id: BoneArmor + graph: BoneArmor + startNode: start + targetNode: armor + category: construction-category-clothing + description: Armor made of bones. + icon: { sprite: Clothing/OuterClothing/Armor/bone_armor.rsi, state: icon } + objectType: Item + +- type: construction + name: bone helmet + id: BoneHelmet + graph: BoneHelmet + startNode: start + targetNode: helmet + category: construction-category-clothing + description: Helmet made of bones. + icon: { sprite: Clothing/Head/Helmets/bone_helmet.rsi, state: icon } + objectType: Item diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index 25da0d1073..24e46f3856 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -140,3 +140,14 @@ description: A shoddily constructed bow made out of wood and cloth. It's not much, but it's gotten the job done for millennia. icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: unwielded } objectType: Item + +- type: construction + name: bone spear + id: SpearBone + graph: SpearBone + startNode: start + targetNode: spear + category: construction-category-weapons + description: Bones and silk combined together. + icon: { sprite: Objects/Weapons/Melee/bone_spear.rsi, state: spear } + objectType: Item diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml index 283c64a10b..00153ef23c 100644 --- a/Resources/Prototypes/Stacks/Materials/materials.yml +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -77,3 +77,11 @@ spawn: MaterialWebSilk1 maxCount: 50 itemSize: 1 + +- type: stack + id: Bones + name: bones + icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones} + spawn: MaterialBones1 + maxCount: 30 + itemSize: 1 diff --git a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..12eb5037a200bea1deab96c2a0ab379bd8abfdb0 GIT binary patch literal 1501 zcmZWo4Qv!e6rNHNR>IHO)G#SkR(ePm54kl}yXKm7;To^&iRVI5lnG!T-y{;dwmw6K#*_*lL2^RgZrV~W_6ILn;A>|^)I>E$%X07!yoR8vMq}IX9 z7{*mGwgE(zn`Chi8;23@SSlArJDGTd;i@E9C#xMQ2Y~LP#R^;v0WcaQ`X#Fpcm+8i zDF>q@#H1=R27r7qEr=BnEAeobXaVbZsZCM3bqgCkOfk-A4Z6mxXB^wH>SUDhvn@G%IkOd@D024iabu`X;X*{3Qj>n?M0q2H{PqA)c^~R3_ zN^6jIb4t5nVPt5Oi{|PK;PlHOO{u5lR*kOnn}w88&%_N=YLuh~QNZzFwoL`V=9Z)a zVB`~2Aw_%TwBX%3<%B%M{62=VW0c!ZmL*6#&Xseil*W~@dJ_Tj719B%=222af1pG+ z8;kJakj7VY))(ZPgM2k_UNy*ED7Kq&K;Q$2uky!x#MH$oQ-gE}2#*m=rmW+jH)!o6 zRC1UT`4RG0@kALfx60vGnsN|?lML5W(QOptB@zQMDHkRZ2^s@(lk9IWqdiJ0m6AG8 z?5N7u%R(7U4XC)CFbDYf_c1j<)7EdPRah1=5JBD2KYa-! zb{pK8*az@^m@bH?Sr|$8gBIW)BuKqmgiM4)g!I(Evi~Jk_5Uo6(rfPYbth?Ub=L&T z%lF8ApN`(MI0}=9y2sMqM22bn6S!Sm^$a=D(qcoYo1VX*acC2{Vx7|lMxMNMqB!%D zBOUq|j*hqItY1C;hLQP`vSh~owa=-ucVZ={Gp}ZDKRw3r_{VVCOWCvRwJuNgv4O;% znakG>+qADQR2TUV%`5NSlAIIS*YbOT`dZ_%HOZnv$I6SF7w!eadu-b9pYQC=doOBID z-_r}qdmn9KYkS|#&<7h{KJdcH3kRRL96$X0$OxY|H7nqr`hM{vn`$E`|2o$)xwCI_ z-Y-wZ&%Bx%^Wp1n40g9IoFd)2Qp=nDOEwmLr<4$#lrcl(jOxc zVpP|g%THzXs*6vJEN9On84^>V$d};TNSLEM9(q(u{9C2Lt+!)F^ z>MVNf$j$Zkb<=y-&U!0QnEQjTsZ$$=RewHV>G@r~o{Swc+J?S#d^M*FE?hSI#q*0U yb?sVysHSA)8sTQ2uYPOx)k#Bn&7QMUu4NoJ5Hb@hW^T701Sl<;>kiFc^ugb|)*S8t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d772d55d24f3990c5274c070f241fc66f5f4b15a GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy?EyX^u0T4R5%N z3oV;d4c9bke!G=*Z(q>2N7ZMyWlbqGEDn`;cdOXTM8eTR!ca$IORZ&;jp3T5Sw~lS zDJV!7swhOcNG$1e+}o>ZsiS#yo7di%UUL$IiajKkdJP3c1S}0C_MKc;2Xu;VNswPK!+#RMhYFD_pvJ?VE{-75L7_x)(^co_i{gG-2md<#{JU1D7pyay%Qmz&(HW&SlJu z3cBGnhk3%@n(T1&mizPL%-=obJRF<&PQ_#?_JwZPbeQGDeWu(Eo;@M&*6U=jNG&(m z{iVwy^nbP0l+XkKkJ8ZV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1f77ba61d0a739ab52de8a062f73c692afcea4cf GIT binary patch literal 658 zcmV;D0&V??P)BT89u?N>VLy>X8y#@*E^FAk-xHyDIoTkl_yQ`+mR2B}3j1V2m-w z7-Nhv#u#IaF@e&iN^YK=y?vgB27_H^{D~wo%r4E)+Or$Y#imV_oT`NDS0Wv6z%I?u z<*{>+{dHW^`r%a*dPIZ_pE*JCsEoJS4^W3=c>4GzZRTE~u(=2O+W{^N1Q75?=v~P{ z_WfsHyIE_iZ}8&vM^tME2pm83v91YAHFSlXy`L}C>dUfkXfQ~*4cj-CJWT)~_tvqp zzSCAcLszJ}{~i8gJt%+LZ{E*s*uuLY>?^RczT=a7>xf5W0Knu(9{?a8kvrOaBkRjo zLjTDi?%#=Ga-ul{h196k82c~$0Hja)$n(NHHUIzs07*qoM6N<$f(NBBG5`Po literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f5aa1af07da762c1525e7cf6ac3dbf3ae7c92a37 GIT binary patch literal 644 zcmV-~0(84&&SQ4OqXF@RE+a5<4)0T+F%|L1hn$Jj$8Wag zZlykb$8A{7e1+qv9l$#P*f;a80Ylfs{84!^UcJfNLO!Rw{#3M$2L}WI)ZQ|dR@OUm z^FZYdsNN5p?!i{+CmcOT{+fB$C$O}#Zc}^9@OxAMz~pE@0Ko52JAU&3@a(|_Opf;B z@jWjFPdc&rUFyr6OoU~>=T7zV$rUlvQAs`5rJ>A*u1PWx7Bd}{VqsPcUF(VhR5xu& zW<%GcdRdaL1-dCK5fKp)5fKp)5fM?hDdlG*n~633Uwk$blTv=h@^$uXj~~WDVi9ha zf@T&Wn~90rrC=ekX!+cSF2L~6PUmHQIw+9|FV=DexLpe7Vq=yUVJ-$5TS;pcBE6|8WJ|zoywYSjl4H$DvNq6cJxfOOBW_B) zE)mluKaM4u$VDh@v87w7VGX66X%RPK+l^Y-{D{3^&$!iC_ea$$RI}6u8RwcNR(-JZ zzVE#^Z{B>fnMB8)s*24O0D!9YwwOeHOX*|E=z8qj$gcpDfkeD(H>Du~xwr`Gh%`V9 zf?IN;rdNXxEN-edDvt7 z0pRKdG$xP?A^@l?%nl-<37UNp%R(!P#NM3Lo3&UNE^9c+Dg%mK&FEl>H!jKvUT#MADQqx| zoDw4if_g&Kl4U9xF6I?$p*tn!XGA%r!?at&h!})hM9H>qkv<)}c6<6WwW9N*l$3YE5UUm_ke>QREyIrG&^d zD`EtIy3n05ojEsH_CT#C^_Rzr1AGBQSP3^5G>YD8iq^yd_-oR#7NTaWB{&z%Qy42lVp-h$4CD}gzg6=Je^ z%%qqEHs37B=>S9(W7;-{1!K|{(n{FGo5Ny02=!52AJJ5n%~nS&03tD6Zv;U-$2ajp z+$ae?>+n&CA)_QjzK-Ez3QGE@j+J}lV$qh9k~7A^dJ{E3Iy_m{$Q|O(O5P04P20F% zrZ0#mvbZ0Iw*piPwPT@?QE`Ugl#-v*iZ@(wfH)9vZ9#UqNRNZ@EbXKA$xM_egeWP@ zC9yGSycrniT1y8SqzV8bRFvbjJBy{J@VzH>7BHm>S4;yL{77G?z z$Atx)U+}DqAkg1(LQ@Cu*3WNl2H*iOBz3$9BvX=z2nlqk{-sL<-d(V^NcZ6lSSrYu zSdQo$K??Bwgjn~ANJxlAh*SJm_P>Ny|IhNIv}bLuwIpqI&s6G-b+X}0(RIs{93uQW zEBTNFVen7jZgFZSdXx&k&>j=Ix<`L||Ko~_(a4vptq)(X>R8!?_n&-i>efTw=vUF{ zcWZJ}D^)|Uephql(r97m$>(bRSZH1oPbo=|E z9orUu*uM9vcg_pv`j)nR)>1h(aK2?F+&_OIcDQrX#VP|luYNn;dHl-HA3k`5Wscl# zJ+Rtvw$MF(u;JS3-dzXK)m_i1*M9o*abVe9X!{dW@9pS*`WOE7H@6(0tH8_~4S#KW z>5Tc-7vnXr$Qlo?pZuifW$^pWGc#|OnmyL}(e;k9E$YGmy&Y)Z-4UB^-FM_~bt|{S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2bd0eb748fab0d02fdd15d245b31cbd3773b97ff GIT binary patch literal 1433 zcmaJ>e{9rL9Dl%q6$jKvpx^}yxtTRAxXP((av@i9gj+e5%dx3zJaA`bSardp4!JZF zjxy!w4ms(F!_EQLfU``3bs#`g8#)26DfSI)ce;8fK(uqw&?ALb=0Wb}Og7quV&O$AH_F>fh(WwXOtdIXk}SHmFZ!r20>^E zJ2#73mmtPDp((0+8K)Wu0m1|rj%xIWRf3S?EE`h8je_jLjXsf|gF`>dcxaE<(p~p^4#JMIOg-uV8j_xLY9zT#C?qvut#6 z$N}0-!n?3AW)=&U&??|_a4yKo9TL%K zg=fCi(46VGLXa3uU`h|fsvLVFqa*|=F6wTQ^)jTJjZQHzyAl)K|0~A4u2`H&k4v1FBMJzhSqL^Y*krCP=+Q8CxOzG zkcX&cOOPh{{|V)J2&m$RG$=kSl@w6gf(ZZe#iagUWIynLW*!j!8BUgl_ANU8h6+nl z5#a~p$csR&pRKP+UEFM znH>C?euAGhvf=Km_>Sbc(c{0|i}l_gxVPobXV)(Muy{NF`iHm1NbokeHg;mu(Cr+3 zW-5qn`2M`Quy%O;(N4yfTkLss`sk|tospK>ZqqrKJ=^;$zjr)-w&v=tibVPmcE)3a z=`HJ${g;Q|aDBYw>8Ij%-XGk)d;0X}*5dR3c=FV$hTW%!o?U)s&*0^64!=b$dG*J# zC6}+%oI3Jy&Fm>y=bN1;>sL?x=_~7tW5?vku6KF-sr<_9=;L*t+rx)?mtuDo?V5*ezVX|IuiML3 z4xe0kuA}#Mdi2^yhu-V1xV4;Huw~+qd-dA#%}49=9TWmZTGWDqgMUB=5gZC7H*}M`OQ%vYgkl%L z&A}lBDJ4*{bm-t9l*W)BBq7$jT<((lI^~QMti8PFAkSyN=l$Nx-7U`nL_|bHL_|bH zL_~sYGp$CswphriR^@Z-jPvM{VYZo8A3v-`hjo8^Q`3`StR>iHT1`)en3J^%O%M$-`C+f0lba} zzZ;@ju43%U7<~WYd-i=D?N&R=@;aX6Q6r)YXrDTGuy7AIt_Nt<4)A8}G0N4;s5hNh zSx;Up;@VXWt=a)rUO&V0m#dP;1t9zi7{dg)eV_l1zwX>ba z;ZcB{?f9?KpNM}021@0gSk{+gS1gN&h=_=Yh=_=Yh=@o`v5-?4%Sf!w9>`dRDi(4h z&k=8iW@hIxHPIjGzku^(EJICA^f5kubL1@11q>>2>+L7#dSa~`G)+TxYadS^z54CH zfjCQ-t;dHdaW9!R8vx*Wfa7@h-aduj4RPnzZ56kM7hAylcdKf+690N!lZrm0RIcIS z!u>Nfe4LqL&*^X_-e|ZmP5Z)?_}?;3TWd62k(pu(=qZI#xrYEis3msqkx7cuK-vHO00000NkvXXu0mjfe|;0O literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9a33a3051e995374b487c7c537e76e84934b98b1 GIT binary patch literal 607 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{dpRaSW-L^Y+$8Z|Oh=wh!-H zxw>Szn=WlJDG_M-!`QbjvTNbhOAG5APX=(^JtBSQRO};_NscVX^JJ}50$f-M3kxz9 zh9o&B&1#V--g!FqUFil+j&%Kv?|m}&-xsQod0+ef={utu#tt}ONZ~mvUD`H#)pWa) zhyUtYo{&?jYnF8WoOE%Wf&RYJ_inU**Jk#$$XeAXjilvr=SRGJxaY}Z8YJ^%XdFUaM-xWYVPt8PgSf7tD&n?(t? zoizN{MCcdqj5zk=NJT>0edY|4=!$Pef|rB&UZt~F?EWNj^pk|v)-a2eqF#F|8-LwA z_%uD3E$v$^i%G6;NLFr&d0An}8-?8)yS>)(`bPhL{k~!DTbaH-**7`Q*-q8GwO;Ui z%ZpXs<=%GlXDse>a6y3oi{eeU@a+3^K843u?p?lSy!r-7E+gY&`HdOkiE>U+@l%0} z&BffOp3D7Wxb!QlelgI`dbX9lZ=T7ybQ~>I5o-MSE_wgDaLeua)_<($`mucexZ};$ z3(tGi)ZY0W+7xnZ*Qren-Jiqu{|d`|v0is-m8!h$j`o+D?EUh7k4|qF>w0QfWBZda z*1x?-`p4RtHS07ZvtPJ7T)(_1%5;6m^Q)^QZ#`Qd9XwTfFN>|>120YgZoL@Ihj$Oj qyW1!}c(7?*dFl&$D;Jk9@jp0w#Ms}gSRf8cJ`A3&elF{r5}E*`*cKT8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json new file mode 100644 index 0000000000..bbb0aac664 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "direction": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6788174f5a389a1f8cdadad0c9617c45ff9886c4 GIT binary patch literal 3567 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 aEbs?3VTTTm($^IL0000tJKzFi;AGFfRiu zg~2M@dh8B6r0yV3l8sSyI*@)p5Te5GJ$-raC*=14A|fIpA|fIpBBBRGYPvzkKFVxM z$D6ljI6GfU;yef=_`&Ml{v7)#(-awFd4M2{U|Tw_(;LJ|S}MM(M@=`lTsR2A2*z_2 zhtp}MDKdgE!gAr1j*pXc=USYkrQ@q=bVTQ>n%!l59(dZRv=U6ymszhX-01002b- ze6qI(*YjZ-vr6%!Vg3pfZ;;V&(8g^7XkiHez~OY7?e}`c`R!(d^Q)`Uea%%h6LF%Q zrn5g05fKp)5fKp)5mCp8D$;f}sjANY*S=kXt5SOVT`QHLwuwy_Vk5=B=;QzZc_n!) z5AfmjI{<+69U9iK^=C0Eig?;E!Ep55`0)+jEP)BjE7zW_ibu&3zoq#kLge>q-2|>V1M1(^AfT1FLhyIEVUAlKF{SO|z777&t2ZF(1 z>ZPCvLkA05kI9h1Q3r7%N~F3`QzMc00prslo9{kZ`?^e`NGa0d=% z-@aq!O|jc-;_JmlWvf8M-|EQFR4MHb!U$JCmbvj~D&Xk!1g(yYAdD~^c>sXn$U_iD zXmw;9ot|uC9Hoi)fn?C)1)wngOag9~x^3y1cX4S{+3ol>Rf0Qk(n=_bKX(!oUoi8g zFr9-mi*=a|i+ZU>d#u8}%dG-%FN2v4ZXIwF}S9%}QTU;@xI5J-%G8FZ)`C0BqcOt%K4DSVk+@mX6`btIe|mc}gWf3|KsdR%fLvK>QD=`y@zD-EZTG V+Z8lb$uR%`002ovPDHLkV1lquCtd&m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json new file mode 100644 index 0000000000..e482264df5 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7a802db3e31790fa652aac8d9ea5ccbf0550fcc0 GIT binary patch literal 2074 zcmV+#2<7*QP)1hd9map-V|RV7y*_tsPVa(Ed^FfGg>of;5fv5`qW~e)3PCMxm6iaNQmH7QLPeys zX-SJ3ln>B~rYIq43#cW860jlRFa&Hc-~(fOy?F0?y}MpdKbg`5Y>&K#RGr_)(W_^k z|1)L0`6YlB&j<`6u|30 zDHAu;mQ$E5(AgcrABf<*eT~^O^7!t`sZV@5R2EGT0qV~OptFH}+lof)Y1ja2tF_{$ z&5Nm+n$F($OmrCsFk1$wKV#yjJI){k-J|h7YPPOkAOe`J2?T>s_qm^%rFyn+oIIis z;zly4?)`sp@R*rHr#f-@!mMAWW9x65$;pc2;&t~Ey9ey~@k+7N?BGK4T>)THt|&e` zJ&Tr`z38%(BhnZ$fbAP6i!UtEa`t>5cT8RY;hz^wcq3skHzNxM0G?b2oNw;n;E7B3 zFMzMVk5iW|BqwLFw5ounsu^POoc%*ypdqJ#s7#?RK9@^3++4V6zb{nZU=^}6187o0 z_vhc^X6>R1@xkH&j@FrlL#H~0BWElSpF~D>`mj1fc7QHVgDN?ZwjS?)9j~p{imRR* zM`w40Q<>DVCQ>`Qz6uI)r#bNb^3?MTrl~{$6@2`0Z zK(u=l%=?CcrO$fkwe%Ak3$JdPgSq7v>%OxNKt$r+LJEV$&n?q4w@fc;QW9}^1DI?s zZg-ghxM#C4bzCY=s~dmcz_6Obt^%5zbYde;w$|p8J;}g@E)QFN)4}-sSf1ZdL54=) z_aAoB6O8A@H7iD2Z%|M$5v$FCCM^}4-O0v7O&tAQ8G(QYyE{0n=8ysW z@q=4}AjF6_I)Yrh?iQAQJ5{vU984c?qgfI^|VY`_2Cm5eJx2IRjV6N9ZTV zA`pZAn-w&)9z*cu;`RAQRp4+q9IpEzq^GIr=rI!!2k?1)Ofl%O*=)eb3Lj*|&jJ8t zrNy+~YKD}VZ2V<2dq23#=B~ zhkw^E1xW!M_|*b&(V|kspr1*`d;Im&PMVsG6y__@YKQ+0H(H`yJV<;eSa-n$K{a4vCBf7tBb^xB-*+Kut-cmYdU9fvgsc5}@gXMFzxcy-sc0Z8X8Il4(U4X?A z!te4>T3LwG(~l!Im2he|+d=&5 z#STZLtw@qOARG$g;2Dm5W@7)5Timi2k(Q=L5g(5(ww;CLxlv!IAEds)Dl9C|MHkzS zB0e64Qc2D7CHGT!am@-b912U)l+*#!iVA6KZ%3Iq3#ZFXo=%6u=|T}7i(c&@J9F$m zP8REvFLXj zO3F%0P-`-=Cd{X$d+h%iZ0UAmO_+~blSx@=2@0i>s;b2(RVqq~i!k;WCFw~DAYYfm zt~d4wDn%UU&erkfTYH7Z#%pNQDFj3PY~R;9=D*2p-`6SxL;YyfDKs`-y14^zAk6%PX6W3(hocSxcEAGk&%&+k@;Wc-|06TOZ^11IsgCw07*qoM6N<$ Ef=1Tt8vp*7^mlji&-;I#Jm)>n zfjoKg{Ld&hJ76+s^47#t=vG=2#4P<=<@4elQ&7q-A^a*qGVSMvZ&YkxV z3{3*LFJabUOL>v}{4N{jk~9~udhrKhf0;2EG;*;>CF(@0mVxNc8mOyGepK{S@2{iO~b&d+lB>K*iDTljhAKCd5b03j$@&>?s4SjT zvP~?)WNt$#OE_BE8M`w{O{EdH`vNMJf|?o$?~H)Wq@#aij=6~R?-=+4c~ARJ07{J& zM50ju8tsh;=@jn%n@mhiDFF0pK@KI;8@fBE9&dIyWU;D>)o>Vq&VBo~zkl}Z?Og86 dlPAxA&hL#jNK{-*ExrH%002ovPDHLkV1g&y#pD10 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json new file mode 100644 index 0000000000..8ee0b256ce --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/46166/commits/b4b1dde442978f9d85d534437a32e5f2fbc3e89e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bones.png b/Resources/Textures/Objects/Materials/materials.rsi/bones.png new file mode 100644 index 0000000000000000000000000000000000000000..50b0439588a7b5041b597b769752952ec35b57b1 GIT binary patch literal 346 zcmV-g0j2(lP)fL>BXJ!{dLPGvHk!DdV)j{vePQ|-A^ty03DClgAScb0wL1OQIE zEmjGy0wQ6F7Xc|hz~R{bu7JQ#yDf)fOItT=_UE4yC|%x3kNa?dwr)t$*mRyrK!7r6 z{hI@fpB{L5T`(&O)$;}zS>bZqB#l3n{cZ6MV1la!N|$#61g_8|jjuhof+eaJOx-+M zE!W@RtL1tSTrKc5GH65LHwir6j{%U149!gy@KJh`fD9pg%z!UA7@ncL^|o$&aBTwp suhr-6LD_;?QAC^l**iQWB;;S@0vubf6n^^79smFU07*qoM6N<$g2#l9?*IS* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bones_2.png b/Resources/Textures/Objects/Materials/materials.rsi/bones_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4d900ad5a43228ac16cf9f3ceb3c5601920bd0cd GIT binary patch literal 471 zcmV;|0Vw{7P)7S)dy1~NU$i|+e!0wO%ST$i4K+KQZHM>Jbw%G%AI2r|r0za3bsyRTm z+2eXn@oZZhwE@IXHd8kT=s(}HT&%FgVf+r1w-rh4NqXY-@rEiKuIF(3^upJ4%6mN5 z`dphfcRi;tSBC><=J1PSxmW?51+S78!6=yYWRPkuILe!Y9*0TV2CAfPEA2?Q`RuzA zN0Oep2asxQa3tx>IJ?nnsB&$CDF z7>l$BlJrEj*`FPxDjagHt+_G4I1GD9dMXZ>4u@Q~F^3uiGB67Kyb8y|T_2!m#72!? zLluEEBC@Ss)aW%d;pk!xExv?xIQ~3M(&}&VzE#?QX&le>@IldRo5qziSnHjW0nT;vF8y6 zerEFC(F6c|y}w~9;-~^d1fVUVvw$%0Gig7-$7ced-HA>DgkbD>e7(Q%@tKfpcYwYf z#sZ{b`7h)E$##eBSovOAZ^Ef5xwKk-OXU}50|r;;tXG>-M~)_-NC;p%R;leT%U4Fj ze$9?3PP+>T13wc&pyV|`6sIL}_^~63myKs@&%k=MsgaL8kFn>~DhC)`o%8s--)ehUSa?eM@KDJ}==ki)&sO*B$f~xNV z+p%hP$XXPq%%*O>S0{!_0e8VePl(p5O`h*+v}8SsQ*PaxJcj%B?t^v=<*?%PUz`nc zf%42WhFU3z;*?~&+k2q2UKPVOXbG52U7|QG4H$fPrAmIZ7|IX|kr1y}o0=V}7`Bl& z3J~HV5m2(AIC#Yv>JYaIs1nJgGMl0DFa!7Vc~9m0XxPv5UW}nB zIkZ?H2Zn*4>BR65Xx#%UJB0ku>OnJxO?Gr42ZNii&5r*rKv1=#OZ9NTM`_WHuH?V? a1;9T)a@wwVVS5As0000Ir1H|t?9S}Cz2A9e-rwhcX5a2SfRpi{#dybtfvi3|Xd&wccLEl(2}a$9u`ZC+ z$CZHbpv9(>F>EI$u1o`d^l>F%F`EDY9uF>r1L(kyzD=G%cW1W%fT6u196$%#`E$!l zCs@xBKhn5n4CmI@;L}6l0J@O*@c?H6Dlc!=G6|+KoLhK3ITD`7owog}W8uYhBCGG; z*8yCI;5x8VxyO@^L%Nzz8d(fAYegobO?V6BW((0NTF7PMY7fCBvX2|p^!guC^CIH_ zSt8>A0NBeYssw*xvICy`;@TqR02w0VfLtby-3L!?5L0Ua0PxZYR?4Q-)&ZB@cVpj( zw(13`x7EmOXl->s)Sv`}Eg&dznRwU|2!bF8f*>M{>0Kg#xW>qo!m^*yDsZF zHcW1m7|t#992<4lRr4p6vMJVSmyLBmr(Kr%GR#f0R%E4YikY?*mewz2Q>F*b0KW^Yy90b-;!}Vi2!bF8 ff*=TjApYhP+c48H_-LJ)00000NkvXXu0mjf!OsiN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..48b74e934a59eaee29473f77a888922888c22b79 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!6a#!hT!HkL*C%eCXnS#U&Z~QC zcPfcbR+lVNkvhD+eD0K_lEQ?&a^h(~McgGpe!&d?;h?sx_9{?#nx~6nNJQ(~X>Yk2 z6nI?SPoMu@|G-JrdD5L}B3qn~{3_JfILOzq=ud;GZIcbtf(4A?I{I?wmS{*FKm9x7 zbHd{1PhX$Owo`M#dA%GZx-I+`@M4|A(CBMH;8FJMJ)SlJmGFWvnpU z?P7D>ecg7sD{PZ8e{_HKGVCqeE8Zq;_4DK38`qm9A2~eZp0{Ax!Yw%y%9sihgRfr% Px{$%s)z4*}Q$iB}h(>v_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b739e105cfa2ff2625ca7b57896a8897e3bcaf3e GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!6a#!hT!HkL*C%eCXnS#U&Z~QC zcPfcbR+lVNkvhD+eD0K_lEQ?&a^h(~McgGpe!&d?;h?sx_9{@g-_yl0B%<~0w2NE~ z3Oue$SDyX*pWR)-ne}Au6aj00$vLxa?@Bj4{?n2%_22}7hkOsbYG^R>P1Rlxxc0tGTH8{5dFyCzwhI&FnROeeUB}oFMg?it|8{~Myk~Imw7s}F=heNn zJC(#It4kKCNFCl@K6gq|NnyfXIq@{0BJPqPzhH*{a8O%Tdle{b=jq}YV$u8d)JZ|0 z;Vh0e7ApT6RGaQ<{WZETH*r4OXV034iN)>A#et?4Q>=^3+vR4c`fb~8UoEu0+2SSB Y+^I|x-=r@p2b#p->FVdQ&MBb@0Q+o4u4^P)w6y-YiJNNi*Cjb!<5fKp)5z+rD9&}~c??}~k z6lK`&NIdA~&ZotLuB4L$7fFosolgLO(9rSd<4ZhwcA#Y+K04eL0N8A-=hjv&@I6^Y zM&Nt$YyTJkaR1vI)JzMyVFCaw+tuz^wyO>M9WgBj=a?QI08UOvxy{a^^zzdff$vEe zjR8y>qFgO{nS&f1?#gCk9bq(Hn19_pUcLT0%R4z8A=TILU`_DYa*$3EShhP`&lUFe z;XQf({pVi`Znv6q*J-OUZCo~76{H#zM&sQ2pZ0wB;rK>xzujueGQZ6|*t6@hJs7R@ zdbe9m*=p!Gi_#k(jEIPch=_=Yh=_=Y=wB@yQm7$fI!T}#=G-W$3}xo)i@vmMS5u)$ z+(*x@OV6&CHaWIzS4$@eviU`2Eo^|Y;p}Oq&TP!;t0Pv+&n{~e3YD#vB8~C26{|ywKovop$ z8?iLikSYqgI-;+%A=#TzRUz4zQAPe-5tS8iOKKn@A|j&O?l&RL?bI`1;YI)e002ov JPDHLkV1f!v2Il|( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a10d676762a02cc7527b2edf89511b0decf8f7c3 GIT binary patch literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@G)`P-{hU*|V;hhQgf56QhEZeh4cmD!OXjO|KX#+g<_KaOupR9{Ejrd+~GUTmYqRn-;3;rH-4@z*U+(HI57FU{zR|z zh0-q__<+iHSNE>|8_aOvaGdDUPbcH04Q02VoUfj9pgA-?RRR^z@%&c4Y-<&DC@RBd7wR9IVZ|sAwmyd^R-+$C@`L^1>i-aWm zjeqD_-EAzZDRD5q-Pyy=Vk#Y4HSIdk@}<6On`fTC_*s=Lr@MC!0rFWv_p`22Wx>cTLJe2H=YM#2YMwA=r%|jHbgU+qbcl^?Nx1*DqCfl za3^5O=6}b^8fKoKSpAokK`Fg)_K`EsPsH1Aj=uQlmHIyBKg?Hv0raM}Zuiw^%O9IX z9y?op_q5piHFIxd_?X(6$gcSL=-hGt74bE9y*~f@#gLTU?w-up@uL5F%9TYYSGb;a zn|f$toL1@UxS-YlpG{C(d~N-ovu>sf6xV$V3d_AwFMIWe+VuM$O0(J{fAY-eyS-%F z^#A?bp8Xf6U)7)LZ?aTz