From 57dfb8211759e70b8cf743b47cc31c9d7afddbac Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Sun, 21 May 2023 17:14:42 -0700 Subject: [PATCH] Shivs, spears and guns (#16654) * weapons * craft * crafting but working this time. hopefully * spear crafting fix * graph id fix --------- Co-authored-by: and_a --- .../Entities/Objects/Materials/shards.yml | 22 +- .../Entities/Objects/Weapons/Melee/knife.yml | 113 ++++++++ .../Entities/Objects/Weapons/Melee/spear.yml | 244 +++++++++++++++++- .../Construction/Graphs/weapons/shiv.yml | 79 ++++++ .../Construction/Graphs/weapons/spear.yml | 71 ++++- .../Recipes/Construction/weapons.yml | 77 ++++++ Resources/Prototypes/tags.yml | 9 + .../Weapons/Guns/Pistols/cobra.rsi/base.png | Bin 334 -> 335 bytes .../Weapons/Guns/Pistols/cobra.rsi/icon.png | Bin 339 -> 338 bytes .../Weapons/Guns/Pistols/cobra.rsi/mag-0.png | Bin 146 -> 146 bytes .../Weapons/Guns/Pistols/cobra.rsi/meta.json | 10 +- .../Weapons/Guns/Pistols/mk58.rsi/base.png | Bin 363 -> 347 bytes .../Weapons/Guns/Pistols/mk58.rsi/icon.png | Bin 378 -> 360 bytes .../Weapons/Guns/Pistols/mk58.rsi/mag-0.png | Bin 151 -> 152 bytes .../Weapons/Guns/Rifles/ak.rsi/base.png | Bin 305 -> 318 bytes .../Weapons/Guns/Rifles/ak.rsi/icon.png | Bin 329 -> 344 bytes .../Weapons/Guns/Rifles/ak.rsi/mag-0.png | Bin 167 -> 177 bytes .../Weapons/Guns/Rifles/carbine.rsi/base.png | Bin 297 -> 357 bytes .../Weapons/Guns/Rifles/carbine.rsi/icon.png | Bin 304 -> 369 bytes .../Weapons/Guns/Rifles/carbine.rsi/mag-0.png | Bin 167 -> 189 bytes .../Weapons/Guns/Rifles/lecter.rsi/base.png | Bin 298 -> 465 bytes .../Weapons/Guns/Rifles/lecter.rsi/icon.png | Bin 339 -> 488 bytes .../Weapons/Guns/Rifles/lecter.rsi/mag-0.png | Bin 191 -> 196 bytes .../Weapons/Guns/SMGs/drozd.rsi/base.png | Bin 5741 -> 377 bytes .../Weapons/Guns/SMGs/drozd.rsi/icon.png | Bin 361 -> 404 bytes .../Weapons/Guns/SMGs/drozd.rsi/mag-0.png | Bin 1668 -> 167 bytes .../Melee/plasma_shiv.rsi/equipped-BELT.png | Bin 0 -> 210 bytes .../Weapons/Melee/plasma_shiv.rsi/icon.png | Bin 0 -> 299 bytes .../Melee/plasma_shiv.rsi/inhand-left.png | Bin 0 -> 211 bytes .../Melee/plasma_shiv.rsi/inhand-right.png | Bin 0 -> 211 bytes .../Weapons/Melee/plasma_shiv.rsi/meta.json | 26 ++ .../plasma_spear.rsi/equipped-BACKPACK.png | Bin 0 -> 363 bytes .../Melee/plasma_spear.rsi/inhand-left.png | Bin 0 -> 293 bytes .../Melee/plasma_spear.rsi/inhand-right.png | Bin 0 -> 290 bytes .../Weapons/Melee/plasma_spear.rsi/meta.json | 34 +++ .../Weapons/Melee/plasma_spear.rsi/spear.png | Bin 0 -> 211 bytes .../plasma_spear.rsi/wielded-inhand-left.png | Bin 0 -> 313 bytes .../plasma_spear.rsi/wielded-inhand-right.png | Bin 0 -> 312 bytes .../reinforced_shiv.rsi/equipped-BELT.png | Bin 0 -> 205 bytes .../Melee/reinforced_shiv.rsi/icon.png | Bin 0 -> 299 bytes .../Melee/reinforced_shiv.rsi/inhand-left.png | Bin 0 -> 211 bytes .../reinforced_shiv.rsi/inhand-right.png | Bin 0 -> 211 bytes .../Melee/reinforced_shiv.rsi/meta.json | 26 ++ .../equipped-BACKPACK.png | Bin 0 -> 361 bytes .../reinforced_spear.rsi/inhand-left.png | Bin 0 -> 293 bytes .../reinforced_spear.rsi/inhand-right.png | Bin 0 -> 290 bytes .../Melee/reinforced_spear.rsi/meta.json | 34 +++ .../Melee/reinforced_spear.rsi/spear.png | Bin 0 -> 211 bytes .../wielded-inhand-left.png | Bin 0 -> 313 bytes .../wielded-inhand-right.png | Bin 0 -> 312 bytes .../Weapons/Melee/shiv.rsi/equipped-BELT.png | Bin 0 -> 205 bytes .../Objects/Weapons/Melee/shiv.rsi/icon.png | Bin 0 -> 299 bytes .../Weapons/Melee/shiv.rsi/inhand-left.png | Bin 0 -> 211 bytes .../Weapons/Melee/shiv.rsi/inhand-right.png | Bin 0 -> 211 bytes .../Objects/Weapons/Melee/shiv.rsi/meta.json | 26 ++ .../Melee/uranium_shiv.rsi/equipped-BELT.png | Bin 0 -> 210 bytes .../Weapons/Melee/uranium_shiv.rsi/icon.png | Bin 0 -> 300 bytes .../Melee/uranium_shiv.rsi/inhand-left.png | Bin 0 -> 211 bytes .../Melee/uranium_shiv.rsi/inhand-right.png | Bin 0 -> 209 bytes .../Weapons/Melee/uranium_shiv.rsi/meta.json | 26 ++ .../uranium_spear.rsi/equipped-BACKPACK.png | Bin 0 -> 368 bytes .../Melee/uranium_spear.rsi/inhand-left.png | Bin 0 -> 293 bytes .../Melee/uranium_spear.rsi/inhand-right.png | Bin 0 -> 290 bytes .../Weapons/Melee/uranium_spear.rsi/meta.json | 34 +++ .../Weapons/Melee/uranium_spear.rsi/spear.png | Bin 0 -> 211 bytes .../uranium_spear.rsi/wielded-inhand-left.png | Bin 0 -> 313 bytes .../wielded-inhand-right.png | Bin 0 -> 315 bytes 67 files changed, 820 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index e0ea00bd70..e9f88039ca 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity abstract: true parent: BaseItem id: ShardBase @@ -116,7 +116,11 @@ - type: DamageUserOnTrigger damage: types: - Piercing: 10 + Piercing: 5 + - type: Tag + tags: + - ReinforcedGlassShard + - Trash - type: entity parent: ShardBase @@ -133,7 +137,11 @@ - type: DamageUserOnTrigger damage: types: - Piercing: 15 + Piercing: 5 + - type: Tag + tags: + - PlasmaGlassShard + - Trash - type: entity parent: ShardBase @@ -150,4 +158,10 @@ - type: DamageUserOnTrigger damage: types: - Piercing: 15 + Piercing: 3 + Radiation: 2 + - type: Tag + tags: + - UraniumGlassShard + - Trash + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index f1a9d29f03..ee55a432e2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -26,6 +26,119 @@ useSound: path: /Audio/Items/Culinary/chop.ogg +- type: entity + name: shiv + parent: BaseKnife + id: Shiv + description: A crude weapon fashioned from a piece of cloth and a glass shard. + components: + - type: Tag + tags: + - CombatKnife + - Knife + - type: Construction + graph: Shiv + node: icon + - type: Sprite + sprite: Objects/Weapons/Melee/shiv.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 5 + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/shiv.rsi + - type: DisarmMalus + malus: 0.225 + +- type: entity + name: reinforced shiv + parent: BaseKnife + id: ReinforcedShiv + description: A crude weapon fashioned from a piece of cloth and a reinforced glass shard. + components: + - type: Tag + tags: + - CombatKnife + - Knife + - type: Construction + graph: ReinforcedShiv + node: icon + - type: Sprite + sprite: Objects/Weapons/Melee/reinforced_shiv.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 10 + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/reinforced_shiv.rsi + - type: DisarmMalus + malus: 0.225 + +- type: entity + name: plasma shiv + parent: BaseKnife + id: PlasmaShiv + description: A crude weapon fashioned from a piece of cloth and a plasma shard. + components: + - type: Tag + tags: + - CombatKnife + - Knife + - type: Construction + graph: PlasmaShiv + node: icon + - type: Sprite + sprite: Objects/Weapons/Melee/plasma_shiv.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 15 + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/plasma_shiv.rsi + - type: DisarmMalus + malus: 0.225 + +- type: entity + name: uranium shiv + parent: BaseKnife + id: UraniumShiv + description: A crude weapon fashioned from a piece of cloth and a uranium shard. + components: + - type: Tag + tags: + - CombatKnife + - Knife + - type: Construction + graph: UraniumShiv + node: icon + - type: Sprite + sprite: Objects/Weapons/Melee/uranium_shiv.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 10 + Radiation: 5 + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/uranium_shiv.rsi + - type: DisarmMalus + malus: 0.225 + - type: entity name: kitchen knife parent: BaseKnife diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 18d0710425..b6155d8062 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: spear parent: BaseItem id: Spear @@ -77,3 +77,245 @@ damage: types: Blunt: 5 + +- type: entity + name: reinforced spear + parent: BaseItem + id: SpearReinforced + description: A spear with a reinforced glass shard as a tip. + components: + - type: Tag + tags: + - Spear + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/reinforced_spear.rsi + netsync: false + state: spear + - type: MeleeWeapon + damage: + types: + Piercing: 15 + angle: 0 + animation: WeaponArcThrust + - type: DamageOtherOnHit + damage: + types: + Piercing: 18 + - type: Item + size: 25 + - type: Clothing + quickEquip: false + slots: + - back + - type: Construction + graph: SpearReinforced + node: spear + - type: ItemCooldown + - type: SolutionContainerManager + solutions: + melee: + maxVol: 5 + - type: MeleeChemicalInjector + solution: melee + - type: RefillableSolution + solution: melee + - type: InjectableSolution + solution: melee + - type: SolutionTransfer + maxTransferAmount: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 4 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 #excess damage avoids cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 5 + +- type: entity + name: plasma spear + parent: BaseItem + id: SpearPlasma + description: A spear with a plasma shard as a tip. + components: + - type: Tag + tags: + - Spear + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/plasma_spear.rsi + netsync: false + state: spear + - type: MeleeWeapon + damage: + types: + Piercing: 18 + angle: 0 + animation: WeaponArcThrust + - type: DamageOtherOnHit + damage: + types: + Piercing: 21 + - type: Item + size: 25 + - type: Clothing + quickEquip: false + slots: + - back + - type: Construction + graph: SpearPlasma + node: spear + - type: ItemCooldown + - type: SolutionContainerManager + solutions: + melee: + maxVol: 5 + - type: MeleeChemicalInjector + solution: melee + - type: RefillableSolution + solution: melee + - type: InjectableSolution + solution: melee + - type: SolutionTransfer + maxTransferAmount: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 4 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 #excess damage avoids cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 5 + +- type: entity + name: uranium spear + parent: BaseItem + id: SpearUranium + description: A spear with a uranium shard as a tip. + components: + - type: Tag + tags: + - Spear + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/uranium_spear.rsi + netsync: false + state: spear + - type: MeleeWeapon + damage: + types: + Piercing: 10 + Radiation: 8 + angle: 0 + animation: WeaponArcThrust + - type: DamageOtherOnHit + damage: + types: + Piercing: 12 + Radiation: 9 + - type: Item + size: 25 + - type: Clothing + quickEquip: false + slots: + - back + - type: Construction + graph: SpearUranium + node: spear + - type: ItemCooldown + - type: SolutionContainerManager + solutions: + melee: + maxVol: 5 + - type: MeleeChemicalInjector + solution: melee + - type: RefillableSolution + solution: melee + - type: InjectableSolution + solution: melee + - type: SolutionTransfer + maxTransferAmount: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 4 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 #excess damage avoids cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 5 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml new file mode 100644 index 0000000000..e14b539096 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml @@ -0,0 +1,79 @@ +- type: constructionGraph + id: Shiv + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - tag: GlassShard + name: Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: Shiv + +- type: constructionGraph + id: ReinforcedShiv + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - tag: ReinforcedGlassShard + name: Reinforced Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: ReinforcedShiv + +- type: constructionGraph + id: PlasmaShiv + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - tag: PlasmaGlassShard + name: Plasma Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: PlasmaShiv + +- type: constructionGraph + id: UraniumShiv + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - tag: UraniumGlassShard + name: Uranium Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: UraniumShiv diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml index d27571207b..c680662ccb 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml @@ -1,4 +1,4 @@ -- type: constructionGraph +- type: constructionGraph id: Spear start: start graph: @@ -20,3 +20,72 @@ doAfter: 1 - node: spear entity: Spear + +- type: constructionGraph + id: SpearReinforced + start: start + graph: + - node: start + edges: + - to: spear + steps: + - material: MetalRod + amount: 2 + doAfter: 2 + - material: Cable + amount: 2 + doAfter: 1 + - tag: ReinforcedGlassShard + name: Reinforced Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: spear + entity: SpearReinforced + +- type: constructionGraph + id: SpearPlasma + start: start + graph: + - node: start + edges: + - to: spear + steps: + - material: MetalRod + amount: 2 + doAfter: 2 + - material: Cable + amount: 2 + doAfter: 1 + - tag: PlasmaGlassShard + name: Plasma Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: spear + entity: SpearPlasma + +- type: constructionGraph + id: SpearUranium + start: start + graph: + - node: start + edges: + - to: spear + steps: + - material: MetalRod + amount: 2 + doAfter: 2 + - material: Cable + amount: 2 + doAfter: 1 + - tag: UraniumGlassShard + name: Uranium Glass Shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 1 + - node: spear + entity: SpearUranium diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index 444c6d2e00..9d8be93601 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -1,3 +1,47 @@ +- type: construction + name: glass shiv + id: Shiv + graph: Shiv + startNode: start + targetNode: icon + category: construction-category-weapons + description: A glass shard with a piece of cloth wrapped around it. + icon: { sprite: Objects/Weapons/Melee/shiv.rsi, state: icon } + objectType: Item + +- type: construction + name: reinforced shiv + id: ReinforcedShiv + graph: ReinforcedShiv + startNode: start + targetNode: icon + category: construction-category-weapons + description: A reinforced glass shard with a piece of cloth wrapped around it. + icon: { sprite: Objects/Weapons/Melee/reinforced_shiv.rsi, state: icon } + objectType: Item + +- type: construction + name: plasma shiv + id: PlasmaShiv + graph: PlasmaShiv + startNode: start + targetNode: icon + category: construction-category-weapons + description: A plasma shard with a piece of cloth wrapped around it. + icon: { sprite: Objects/Weapons/Melee/plasma_shiv.rsi, state: icon } + objectType: Item + +- type: construction + name: uranium shiv + id: UraniumShiv + graph: UraniumShiv + startNode: start + targetNode: icon + category: construction-category-weapons + description: A uranium shard with a piece of cloth wrapped around it. + icon: { sprite: Objects/Weapons/Melee/uranium_shiv.rsi, state: icon } + objectType: Item + - type: construction name: crude spear id: Spear @@ -9,6 +53,39 @@ icon: { sprite: Objects/Weapons/Melee/spear.rsi, state: spear } objectType: Item +- type: construction + name: crude reinforced spear + id: SpearReinforced + graph: SpearReinforced + startNode: start + targetNode: spear + category: construction-category-weapons + description: A crude reinforced spear for when you need to put holes in somebody. + icon: { sprite: Objects/Weapons/Melee/reinforced_spear.rsi, state: spear } + objectType: Item + +- type: construction + name: crude plasma spear + id: SpearPlasma + graph: SpearPlasma + startNode: start + targetNode: spear + category: construction-category-weapons + description: A crude plasma spear for when you need to put holes in somebody. + icon: { sprite: Objects/Weapons/Melee/plasma_spear.rsi, state: spear } + objectType: Item + +- type: construction + name: crude uranium spear + id: SpearUranium + graph: SpearUranium + startNode: start + targetNode: spear + category: construction-category-weapons + description: A crude uranium spear for when you need to put holes in somebody. + icon: { sprite: Objects/Weapons/Melee/plasma_spear.rsi, state: spear } + objectType: Item + - type: construction name: makeshift bola id: Bola diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d9720e1912..05c4fe4238 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -549,6 +549,9 @@ - type: Tag id: PlantSampleTaker +- type: Tag + id: PlasmaGlassShard + - type: Tag id: Plastic @@ -571,6 +574,9 @@ - type: Tag id: Recyclable +- type: Tag + id: ReinforcedGlassShard + - type: Tag id: RipleyCentralControlModule @@ -694,6 +700,9 @@ - type: Tag id: TrashBag +- type: Tag + id: UraniumGlassShard + - type: Tag id: VehicleKey diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png index 42647a9d00ca2dcdd23f497a007c2683682b7aaf..47488959de29a313f9d3df20f453366c78cd2910 100644 GIT binary patch delta 274 zcmX@dbe?H~TfKdNPlzi61A~T!hPk=9yu7@mq@<#voRN`HZf*|42L^@>4Bp<}p`oFX zk>SF^!uIxdlP6E`@$uTZbDOcTVPs^)Oa=z~$}O{I?byNQ3d02<=Oxm|$QT&_(JR4`SJQoU{=*qwibe5;9 KpUXO@geCy1?RRYe delta 273 zcmX@lbdG6)TfJp~Plzi61A~T!hPk=9yu5s9XsD5q(f+Y0^XJ+pVwn~ zcDCvJK`Zal2Zq=45|%P=@QZk$vd~*xaQ$|-SwYIrf1h$#67p}M-_yhYXNgK~RhhU& zaUa_(=aNXbUwd-*sn`TO?)%|uapC)&`<%J$i(4)>gc@D&f5Lg@Ijg3!ch7SM1}+8$ MPgg&ebxsLQ0CK%~^8f$< diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png index be9f287abfb4abc3b940e9f9720f53ab9de7eefa..66bf70c37ea8eba906e6c805f54458cc55fe3274 100644 GIT binary patch delta 277 zcmcc2bctz#TfKdNPlzi61A~T!hPk=9yu7@mq@<#voRN`HZf*|42L^@>4Bp<}p`oFX zk>SF^!uIxdlP6E`@$uTZbDOcTVPs^)Oa=z~$i@kNP|m>uJYD@<);T3K0RY)+d1L?p diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png index 63af10e6a4841ac32807cef3c59be2463365ab5f..090734e292479d9c98005c0f489e5b1b9dd15768 100644 GIT binary patch delta 37 scmbQlIEisWiQKIQR= diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json index 6065916ed7..946d9a1814 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1", + "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1", "size": { "x": 32, "y": 32 @@ -24,9 +24,9 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-BELT", - "directions": 4 + { + "name": "equipped-BELT", + "directions": 4 } - ] + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png index e088f64bfd7796d560ad853caafa46820ac38a99..a49a7a90f706657d8f072327b2e6dafe2013cd6e 100644 GIT binary patch delta 286 zcmaFObem~{TfJp~Plzi61A~T!2EzshV`Jl@qN4r#_xJSl$ji(7`1qI@n@LGZhlPdN z+1aV7YO1NJ>gnn@I=EPvo4L9;NIeLO18Np73GxeO_>TeX?CkS)vZkk9x!z(#CKgZA96XT0V6*YobIePGofuw Y^l5D3J0e%{0A0%9>FVdQ&MBb@0AGoD0{{R3 delta 302 zcmcc3^qOgcTfJ+5Plzi61A~T!2EzshV`Jl@qN4r#_xJSl`1tt9%gdV>n}vmi$;e3A z+1W`+N~@`<>gZ^zscP!!>Nq;MSeTpH*;<>Knz*_+WJLU412jmyB*-tA;XhWep}Y7# zP{|xm7srr_Id3O0^3^vRaJV|IWp>+oEBCwos{^SUXI53L?SF>AlAb0#k^-{E*QCUtAuoX?MMMm%8k*8Q#bp(%{dv&6MWef_oti&nj5 l>L_#Fb0gtc=#S%-%sV%--YeZ&w;1SB22WQ%mvv4FO#s4udcVgu(tOrA|BF|6O-gw@A|Z0PZ6pA$K_fM1KYk?m7-^Wq06#`(pGEQNf3> zw-_-P!x$%2oOY@Tk2AU#)DI+hKVA*oAej{cqUHnLF$NOOEUBXD#GW~46;7IoUd=Db ztc(QGrEL%dtVlvArL+T}*MOxdo(pO~Pp4V)io4%^L#`j_2T;O^e6s<{9 delta 296 zcmV+@0oVTM0{Q}wMp#QwOjJbx001Z`C;+ekGcz-Ca&o`Fzl@BGOiWB4A0IR`Hda58zv?tEG#P~B`Gc~EI~j-I5##vJv%lvG(|)}TwGf>H#SVa2=V{`02z^w z7=Qo&|Ns9mQ%T(b005&&L_t(|oaK;<4uc>JMOy_|x}qq1{r{J)by-9Me!zB`81$ap z1_AyG?E3wO4$HUxgH!sAQt*S0^NKwN#rvHwTx?d>(4Wuay(w=XnFN;|9#1gZC`}0000J5pI2B|n7O%`hK5F3>X`rr1_qXrAirRS|NsAQ)^+Fr@Y22WQ%mvv4FO#nH48sz{0 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png index 4123df3b2e5d4514f854759d03186cb0309a9818..61e29690ee2da9837765c350c2120af8cd7ea7f4 100644 GIT binary patch delta 256 zcmdnUw2x_mTfKUKPlzi61A~;LbY5=0qk~JK3WJ#tgNdg#t6Jx08cXg8 zD=pF877}D;R$9o(%kZi{YHL=e!U><37Xmgk271RZN7V3`9eCSc#GCLT;&6ii2WLXU y%TG6Z3lsyCPiwJg#t6Jx08cXg8 zD=pF877}D;R$9o(%kZi{YHL=e!U><37Xmgk271RZN7V3`iAy@X?Jwd@_z-cpL4boZ zA>rkxn`d*@@rW{Hr9?hGaDY>sfk{k!!OP1Js~lD}Fik!^aY_Tj@|}#U7!Lb*9qQs^ aU=RscQRjNNkL51V`3#<}elF{r5}E+tTyRMM delta 268 zcmcb?bdqU;TfJ_8Plzi61B05Xmbsagl%!ap3WJ#tgQC22U(bZnlFHcVBu@{&lZDcj z<_62n7$ha6d~F+?fg1Qrg8YIR{-c1Wz4MjC%(HLz_8mEEYQ6^;SeckSJM&P6?fvfZ_xGYN zUfilx^*uH{IoX)){%*Z>g-u28@3rn|VQVvkVj^GI8MJ2VYPn`vyZ}0r!PC`` K)n%PiLK6T6d2&hs diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png index c48b441a61edb20c8bab9788ad7a05d0d55e6a19..0ea11e75a888c46b395d232f834ba8657a7b457e 100644 GIT binary patch delta 127 zcmZ3^xRG&!1SbnK0|P^2Nc!=KimKWC0X`wFK)$1cOI&P1UT(gcs^%Y`TiHM%){-E< zV21xdAag-22q>WC>EaktF()}eg4N-`3LOUzhZ6#!4Xm*Z2RUQ=7Ynt?nTYb}E!j~7 ZRLWM%lwRg@%LT|}@O1TaS?83{1OS_TCma9( delta 117 zcmdnUxSVl<1Sbq diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png index 777c25475fa039d94fa65cb0661396e6d3cc38bf..c9f1ce49e3745c478166924941dbc9a1cc24cb8a 100644 GIT binary patch delta 296 zcmZ3<^pt6WTfJ_8Plzi61B1T4zO%D)Zf@?16)Rj_UFGEDBqhYe!9Y(>PeV-w!UmGA z-2p#<8u&|s{DK+&g8>UGkmBUy`nFq30VuW2)5S5QV$RtKhJ1$%cwA%K4zv^mYo#96 zeC5L_?(j&-a8mocCPA|>m2E}!jCqG97I?AmGXAhs<bvnd8RC}b6IAQx#8?}ujLLeX`3UqE%!8Y#UojVePx~ROcmq4 k7FqWm{PSnF{hzt_^fQ#@9!-sx1^R)()78&qol`;+0GqOP>;M1& delta 235 zcmVDhOjJbx001v9FGE8^ZEbC+sHh$u9xg5}#wkLt00007bW%=J z0RR90|NsA`f2R8Y005dvL_t(|oXwEE4niReM$5o%;j&8;_KO&1(HG#7)Y*mie+A1m z{;tNvlXUn_zNQ3#e*@o=*?=_^pE(*rgQ5lH(O4TJC{Sx+_6W5yvhz>^eP?Iq+}zw1D^|F=y2{DPIoMc4 zg#~D6Xh=$kiGzWLnu?yD9)t}fooeo=0CftL1o;Is{D%P+Rv?R$kIVPF(GH;OHcuDF zkcv5P0~v)5Dex@TEYrGs<$wLPEj)AY<;q|9QqQ+eC6jx~r{i)i-!xg&wHQLo`do}0 z*IK4r2xS(168h9+&ZX>@)y|?xY8zD+m`aCvWj#IhD0^+W?*a)8-U-J)tc!l5`J&ly zvc5$05{27tmrA8Kw0^jz?Uy)OFja|7xh7fAPKh{Tp}o%GP~ZEc@BMM_uMTtNmim1xtW_VDNPHb6Mw< G&;$UC#D7Wv delta 255 zcmVrPk;bFV^V}}Eha{l1&Tk4>hdk~s@f9Bc>}yZ^nO@pt8h)E&WXb>l002ovPDHLk FV1m#PbQ=Hw diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png index 1c0efd411afbb939192277ff493448e2e528aeb9..50feca5bb6e1fb88bb6cc32e5a3639a1b79973f9 100644 GIT binary patch delta 126 zcmZ3^xR-H)Te(DlPlzi61A~K&MO0XThK7cugqVh!iZ~c}6on-L|@0CW`<7 delta 104 zcmdnXxSVlreoZNg?NuUS=Ye|q_FvEW!kh!211Qby4 zba4!+n3J3!!OFt8m_cj4=Lwe3hR7QNzU>OLrY+=RSaqA>u>F^-p&;F!u6{1-oD!M< DG&~@h diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png index c91e0b1d1fada8ddfad41d143cfa3af95cfae4c7..e30d896202d3f6b8464d3674ee77f473f05c4f5e 100644 GIT binary patch delta 418 zcmZ3*bdh<21SbbG0|SH0lCEPD6;FMcOT3T>H2OA3@ z+r!CLRaMo+#U(#8K}ksos0;`+)l{UVrPI>VCQRtvzI}_Eo13_}czAfYp`oF+wzdQa zhy#^bT3P~0Sy@>LanX~T>Zby&R4obes}E*i`tkce5d8l4|NkElpwdzCn0F= zDtA7QKR_aRZgGf^cG%QauXfpqsL7qzVSC+o#y6f()i1YN&h#bky38eRE^f(bl`VHJ z{9}5shB;I5azyfqJ!Q3u^4Bg*d~r}<hDIto$SSY8C+f#o+1c=d#Wzp$Pz$O{g~j delta 249 zcmcb}yozap1SbnK0|P^2Nc!=KimLU}0X`wFK)!~ChMk>VSXh{({(2b}9`lIIiDuSFMcOT3T>H2OA3@ z+r!CLRaMo+#U(#8K}ksos0;`+)l{UVrPI>VCQRtvzI}_Eo13_}czAfYp`oF+wzdQa zhy#^bT3P~04K)>6Sy>5jQ3-LWr|PQ|80r}q)JuZ=f*F{8{QeIFzyJOJ{|ChQ|Bo3= zK?xQPpftz--OC={1v>Vor;B4q#hkYjvW1!qcv_m(Si4OZtW7#9uJPS|(ZW)RqsLjl zWdAEEo4thl!)}%NEhj~Ul_auwR*7gjABxz#F?CVE^Qs-^wjO(6P|w)FTIiKrwU=Yc ztO>zSdISsO#6IeTGb}Z{X6c@tbTn(RS!igkw{U;DSaYfMvt92Sf_@)<_`_t0`Ho%F zG`+czP`t^E7@*DuandGbR1 zr$u}B9n)dX@mY8J=*KLD>gx+tv+XU~UL5`CR=?!+zSs5l3Ycen=SzI9wek$mn+%?= KelF{r5}E)GLb&(< delta 291 zcmaFCe3@y21SbnK0|P^2Nc!=KimLTm0X`wFK)!~ChMk>VSXh{tbW&U}FI5`e`4ymQzLFrnV21z5Al&P=2vBB)r;B4q#hkPLhJ1$% zc=jk%CUymy5P7dE(Plzi61B0Z5n1-5)tgNhyjg`2#xPy&FR9Jw9hDJuhhc=)zXGxG> zFvEW+FlU;51t_TD>EaktF()}eg7pX!qlumHEQZaSlvgpVo>|Gf%A=TdmZVGu7n?K# ZgYF}y|N7NSrUUgbc)I$ztaD0e0szr`D0ct= diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png index b4b511cb8ad960babc6c0f133d9e1dcadba24667..133fc41a804a78f8525c043eca796308ba969f5a 100644 GIT binary patch delta 362 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png index 11c3bef79ca4e04a7bbec3c9c23edd873ad3832e..fa9fd976bf65843af1640e56ec1ae225f8d74c3d 100644 GIT binary patch delta 370 zcmaFKG=+JB1SbbG0|SH0lCEPD6~*hhg&7#Qg&7%U&5;0#dIb1{xB_W+cXw@VZAnS# z&6_u;r>9FwO6uzBii?ZuYNoHqWl?!fAek!#px`tZzE)neqO`8M}Z9HZ6bp{2EVOf4DbCS>*QTLzB1N zWYrMVG!%^XQIKk06~FuTU5%C?Ig4d-OEh#oaPu5~tQIEJQn1z1G1Aq^SD=~YliZ>FVdQ&MBb@0Fk?x ADF6Tf delta 327 zcmbQj{E}&c1SbnK0|P^2Nc!=KisJQp$_xy8%8V6D?aP3oasfUeu0T30rf~1^lf6?H z8k+?=+50CXW=-yCQ&+Oo*K{~n5M&2b!BrCE7tHV<2I@LR!hoXZJY5_^D(0M>;Kf-`wa?5=ohO=xgh?R`qqUi&m$q&YThzyY`Cu$%4#_+wHS3y!}Ysbf1U8`$1C|~_PH)sme4}LNBe=A=pe7!QE>la(m zWrts#Hg*Sms{AG;CpI`n;KYGQV XOKM%|4b{H@^c#bxtDnm{r-UW|?n{kU diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png index f909b598e792a3e371c86bbfddd0709131374757..1a06d11129dd1162f14d3587a6f561e138a78b33 100644 GIT binary patch delta 151 zcmZqSUCuZ`qMn7Bfq|hhB>gy$Vk{1FcVfJGQl}os;VkfoEM{Qf76xHPhFNnYfPz8+ zJ|V6^T2fNd(9kd=BO^34w70j{An1w}P?W7C$S;`TKL}J+KKKU|k@0kK45^rtoFKs( q!rIl delta 1663 zcmV-_27vje0fY^Z7=H)`0001UdV2H#00ZuNR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3 z004N}y;oV5<2DTZ=P7aoV&ifguJ7drIev(}p>29|Z(Gp1r1d1pKlHK^{@9F-+ z!QO&Xiz(y~JPys8xnPj|aU4B)-Pe8ac?`gbz8LbC=HrCH%6T^W=7#y=?1Yt`WiL27AJehmiPv<-?O4 zXTfQ>k_0H?im^!A*YF%acMaVK0lbbL;^!~O_IM9H++YP`0AN| zMKo_Np5ixWPk(ccV|PW7M_I$UsmoUO2#OWql)WsVMVy9l+%2OeUwi{=9b2u=S4=W7 zB0fo}Q=v&?_l+7LDi4n6nH$TNC5fE5$)Z44qsh@pmJTjh8kiG^`HF?M-@N?6S%T+I z&}4!!aD3m~qu|wcXK2oq=0rYSV+CBi@(VB)bL$E%5Pw4RjH&JTk~=#8cr0QC4B8HJ z!Ul`4hly%*%PrYFi#G>V^~dukvS3}jtTq}AZJmoV1UdS zcc5fN-h-UP%Qx0U+PZ9fh*4fZgyBJnpe9QJS*oT1&s#zY6=z~O_oB6DW#lB<}4^<=5oj}r<`*sa9Xs$R)KzjpmLR})oQ4* zrkZPMNS~(7T4=GQmRsrErK1G69(wGl=UxU4q|(q~BaArG$fHc;+LWo&W|(oNnP<7O zcCvcU+9Pv+W{pnPcoVhs;*B+kW4xH4RZeVi27ks_35>_Z01}!PXFicCFXk3!KC?Ix zW1zG}PN&5f7}P;*ldjy|nENen4$=KCZ~PH+Zc+CR=G>z07v`RM`+&7xcDa>J(0U3H zQ&dR7<2Th8PWbs(d-v)>88WZK=8O9oj$7}3hU0eEy$8=14gDU+t#|Li^G8Ep!SM$A zKYum!JsdC7|EZx@alAQ?77X_@9B;{^`*8es^uPMJ{NH8d&*>o}m@A`?iXuO)m4S*+ zzV|kmuQKMOO=HE^pc+9E(i*6(ul`%_9tGd&V~g`LbUi)a9@Bu*+Cs42GOe|RJ7FIS zD88m;tjV5h_eUNTzXw0RycR6Hs@5 zJFlP~Kzi*pW|CG`KHxuer-f&9>;s>l$C9SyOmFw5w-F5eyvpw0y`jopDx^$&I)7#N zFU_OjP|aUp+yDRpg=s@WP)S2WAaHVTW@&6?004NLeUUv#!%!53Pg9E`6$Lwp6vp|llRbufA9A2ex5Qd}Gb*MfsTi&X~~XI&j!1wrr!#L3Y~(M3wUFDbN$ z@xkSNocGS*zWV^7QDLgtH36uaWq+jNF)^E46}w*%zyQ?$?=2#!SC6cg{et5DHsC+FSh+L3Uu!R z&AM%WAKP~G1n@rtS6bU&Z2+^Mq}SV8G?f^qix@1U>pUR zz9|O`-U7XA?%Z1EIDG&zG=Hn*8{ps&7%Nity2rbFI_LK9o!0z*09*`mp3}M4Q~&?~ z24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm411|}pT zs4$!W004$bL_t(o!((6=1*2dTjDk@x3P!;w7zHC8Fro{nD_Q>6w|KH(U|?WixO?jX z!`V~o8ENSN7IXm~5eWu!O9MFn>?zuY0MkH60Y(TYt0^#?JbnQl1$1`+0|NtHqksjQ zfNbG_WJ7u-zELn}003+&CjqLJvPJ*^002ov JPDHLkV1k3H0b>9F diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..451406ab1ec5ee694853095574b4e04a1d9fa650 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_Z{IpUZF1{{8EcPtudLv#x>&ewQAy1ipagqKkY6yve=t~D zzw9?q$l24yF{ENna)JcwVg_yj1%>k~92^=27%S7lnYetII5a#|73{g(4r(lrOi)?U t5Wsl=D9^Z1s3Ae{klP9lNmdaihO8M(r?XBhPX`*u;OXk;vd$@?2>_0raBd4d@J1rJ| z@^#^v_|s>dn%^o7wKfY@u7xWKxV;@Wy6T3Ubki@{?p~v)g^M}_KKyw*9UHx3vIVCg!0HAh22><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7b3b020f9670ce0b284316dd24582429a68ea9d8 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_FU(kb#Cv50XVtXHt^421a{>ynmIV0)GyDevnG0$l<9$3` z978JRBqvC)E^aV6u%f}+O>or#j&_^Lic=KdG{iP;X83sSKo$#MvHL*{3Dz&HT?Jx` xnanCH5*t<@aM0r^5S6HCWR82Mv4Dwz!TlohT;75&*+6p{JYD@<);T3K0RUw7K#TwY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json new file mode 100644 index 0000000000..455734e044 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..648fff08e4c7cbd3d23a2999f759de4677cd58f5 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_KR^Dwb?Vk)rxI;#?Wz3y{}~t}BO}Y>4Yjni3_HEKPY1A6eCx*<8Ee%Ba^OB4E;3#OlqVDZv`Spls&I7$jn#nQ&@x z2WPVOk_p`sQyFx)=1jPe!xtftUCd=SI38?ptO1?`tucZfWga$rmM1g1Od8XAR~+*AaD8m)EQ4r(mWQV6gz zFwhbRVAGW;5L41|)Ocm!Xf@?nXvcm! bt&9whx_O1(h?HjnUB}?*>gTe~DWM4fR(@gQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ee343bf4be33f9eba65836d3370ffc17a196010d GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_KR^Dwb?Vk)r;`5+3@*;j+S=NYk&$Nq#6TK3N`m}?8U91S z)l(rxK(T&L7srr_ImrnUtY4UVek^5`n8ETPD?A~==+JV9$i_xTRfg?0tA#s!j;~$7 z4UK$p!{S8CEu>#R>Wb6O6g8F)>@NPSQ0HDk$n;Ufjz1mXYE2 XJ6_xWeGQR7r!jcC`njxgN@xNA1}R+( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json new file mode 100644 index 0000000000..0800614b81 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png new file mode 100644 index 0000000000000000000000000000000000000000..fcc238e20607f9f876ed138c6c4b568da46119cb GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x0V6XFV_KR^Dwb?Vmkgw|6VPXA|MD0V7IV_?WgOLK8?(a_Mi`Tw^W zP!V@YkY6yve>kWutGx;oHt}?E45^rtoUlNEW8p{1sTV~h7JQoNbAcsd^2L%C_646T s(-vyJh%s2jz!J7dGa=%rLoNeD$Zw(Bf1dCL0`)U^y85}Sb4q9e0C{joWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6877ed50f1ea7fd25356059d4f93de81e91b4eee GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?4j zBOuH;Rhv&5D5x0V6XFV_KR^Dwb?Vk)rxI;#?f(o6k&%(%4ysf6`5hb_;+`2dGva@6x^6Q3JNvT6EwWpH$}uO_$8ab#(Lmvnx^7m z{>2F*Jw69CR2rtAKX4#Ltl?0&k*m4068BY(ev=YWy%kD2sx!1CE={c9<lK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..55bdd73faed797a02e1ab9ebff10ebeb1b6d1e40 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?4j zBOuH;Rhv&5D5x0V6XFV_w@%&q`SIt-$jER9)&C3(+S=O1P9;*mY`2{olhlAR(+N(g}nVv3=Ar*6y6C_v{H{={xap1rKm4?{9n==~^TC551^t8Fk zpq9q4d}i-l-%An_K}I5y5-qocBxDqXG^Z&{I(nnA@u;pY56?4Nog% rZk-KSD#>%<$;}H-F80W?hA=YBR}>cCxL}4Y(2)$Du6{1-oD!MXPgg&ebxsLQ0G3=jQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e98557d62ac035fba15c1300f336d8ccb5946eda GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_m#y7$=F;_`uow#~yR!NYSy}mMlUr}!I{)SKhpLL)eS0=3 zF&Y>F)$x=B`2{mPzWe^utIz*IU~=NeQlNN;r;B4q#hm1X1)2#V4#EOPPEWOWS}gqJ z>%uefr_VYyzf~G)Z5FIt3s)3ydpmA))eSkx>*}C-MAMa_^ZY%%7c)*YC7 l%!Vq)t_DVCab{aahOTEa=Byju06ogU;OXk;vd$@?2>?=5Ys>%u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..89547bf155ee6124fdc6576467f2e7e5fef9b135 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_m#y7$=F;_`u$XC+TO$hYn*oJbOM?7@8U6!-%mp=&@jjj| zjv*Cuk`p9Y7dONxu&B*sDL82?bki@{?p~v)g^M}_KKyw*9UHx3vIVCg!02Zr2_W%F@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a5cbe99193b7b1e996bbf8a5dbaa7938738bf11a GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_&s@5`Z0(kyu$XC+TTj=_Ne2qCmIV0)GyDevnG0$l<9$3` z978JRBqvC)E^aV6u%f}+O>or#j&_^Lic=KdG{iP;X83sSKo$#MvHL*{3Dz&HT?Jx` xnanCH5*t<@aM0r^5S6HCWR82Mv4Dwz!TlohT;75&*+6p{JYD@<);T3K0RW?*K?48) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json new file mode 100644 index 0000000000..455734e044 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..e194aff0a62c99bf27bdb4162d758b3e5aca7cc4 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_GmgAvsz1T(T%xV5J(ZvTKLbN#WMp}~p_Z1GAxIsA+r!8C zK#Hd%$S;`TKLT(b2~Y!yAM+hqIe0#n8>!r&7dFE!>B7 zMUrO38V^o~4Uya%G%`FL9;qY*UT8a`d2rE!78Ta15h4`}Kgbw}hAjNBp<*#>t9fIC z^oE%Ys~EaDS?)SqU}?&8_{gfh%;wq!S4O=S5do9NB35q>O$pWr24yox#vl;`&4g2n zJ2;cImrUrEn988THD|(&9KHw<6@`t5H)?9ACNObt;(T-4FtkAVxu_UhnUAu}hayA9 mZIdRPQ%m@GR70YUf#J1+#MPjktCWB~V(@hJb6Mw<&;$U31arjz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b6cfc5e2cf2e3b4293885c899b9e7184d3ea756c GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_GmgAvsz1T(T;k&F{GWj#GBQ$ITic+@DF-OWQ4-`A%Dwox_^vgBX_GkS)+GXurg|L*&7f16#T$Fx^?#&?wa8rXmp3XszRRP-B6XLV%Tl zftEl3o32cOn39g8#w!Cyt0~7qJ2o6F*6-_i+?SAa)r=lI$M zJU*L5A52R3Z@92>he(TKrdiB7j{^x4*djPJIg}O7d!2Y>#Pn%{fduQ~hHDJ|jf|R_ z1>zDtTmq~X+&rlrOmkS-mTX{PlwoC4TAZM7Fu|DX8WXeS>LgtQp@O0g=Ebe7Zy6bW XzvH$2-`5ZcbQ*)FtDnm{r-UW|jG9|M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json new file mode 100644 index 0000000000..0800614b81 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png new file mode 100644 index 0000000000000000000000000000000000000000..3bbf3be8dc2fd2d23606e6a984fcc48b53599ee4 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x0V6XFV_GmgAfD%&m?*UD6X;y(ievvWxrP%tgc#l=NKLqq@OnG&EP z?vfzCV21y2P+L}e6)0@t>EaktF()};fdI$CkCIa_ib^c_G}Gq-OT^@hB`xd=K3S$M q)O-{R{#8HP_28NK|Lbv}s;SB`pXYh3Ob6Mw<&;$UEVMJj7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..988df02ef7f1a03e8b4c71afbadc664364e4bf0b GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?4j zBOuH;Rhv&5D5x0V6XFV_GmgAvsz1T(T%xV5{hxs$GBPsUL3JuWzk`EAypxQS@Anp< zBJPqPzhH*{a8O%Tdle`=%hSa%q+(8Tf&}a01{H-CcRxXue4%Lv4urMo%wb4gVx`Sx zVBopK+F-+uN~tV7tF8)I+DTD)z4*}Q$iB}A_r{~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..e3c69de10b6950b1a22c92e810a789d79802b685 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_Z{IpUZF1}5cb^w--k;bsbB92Y08o^zB*-tA;XepeRX+F! z6mjx&aSW-Llbj&Ix|o4mKtbXB3I~Tq0mjO-a3(GvCJqgSlmi+-xrVfci4&NdR2ddC oF|xLJF*Lbya4%F!5eeX6*zU@-vg*jhETCx&p00i_>zopr0Mtr4)Bpeg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..87be907349608fb96e3bd5e316abb7b6df88cea0 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_FWr0k_}%BkrkPH0B?~w2H*yc3Ho5iot@B?#f2gX+-M42` zrP_|IKy^GNL4LsuckbT;g8v}!>hoj=pm>L;i(^Q|oaBTBnh7Be!U9H4PqlYiEd1o_ z!ZY!w&pI`~RT^q-7OY$gR}^r2J8pE<4LQl{>Y#c=)0Ls~{5`!FGfp%p1uTFVdQ&MBb@0Jalw6aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d2e5a28123d8802c086c795b77ac2e5b73aee261 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_AHVy2>E6@CrkT?ww-%^=n*kJJEeY}qX7~>TG8fc9#`}1> zIEGZrNluVpUEC0(z@j#jrQoEol%t5mqo4IJyFug9QI5DD4%eEaWT`Jl^vmt w22PDe+nidCavV%EQasG6Q?YY#LlOgnhaS`0%^zM{0L^9aboFyt=akR{0OKS=k^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a36da4037b624784de8c028f8b046988f4b9b43a GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_FWr0k_}%BkrkT?wx4Qn4hyV()mIV0)GyDevnG0$l<9$3` z978JRBqvC)E^aV6u%f}+O>or#j&_^Lic=KdG{iP;X83sSKo$#MvHL*{3Dz&HT?Jx` xnanCH5*t<@aM0r^5S6HCWR82Mv4Dwz!TlohT;75&*+6p{JYD@<);T3K0RRQKLA?L~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json new file mode 100644 index 0000000000..455734e044 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..be1468364c95206a350d3f76a4f00d7eadae7095 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_Z{IpUZE|bP#lpxV-lA2Ui!RLYzst`7lwdCj@(X784+cx? zm;D9`IeWS|hE&W+PLN<-%)l+6pm2VLgF~YLV`W-66PFJYhlYo$f<2epL5&5H2`Wn( t0yqx<RG=|JNcJYD@<);T3K0RW&;Jf8pn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a566bd72d49a2b21184da596d190844fff5485 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_Bae75x-dg~nV4u5XU)Yz-cj zsrhxCU|OT(x5!aL>&}s&fSf?#kRoTn0Kq~pPKQUEx3}+FX0(7~%1SN;?kVSU^c@Y8 zL<5#EL@rpoyN0dH;p(?8FOm6cqW12Vb!|}1{+T7hm}b77PsCWlhbL??mxS?}xCW(! f0|$;e_%ks4PnSM!X1}rq=qLtHS3j3^P6Z=7Ji?cppy} z$B>FS$q5pyiyLAdaHvVj7M$Fy;Uu!+K~RDU!@^dc6D5s|Vb3&x@(BkRyBX$aHib3{ vJ2g&V7OPBiWtkl~lSka(@zXx0E=GnmY)q%~uTB06G?&5C)z4*}Q$iB}cO^cs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..97a2f4917dfb5e9c2d89c748a0dd0fdb2e8a3e61 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND99h+6XFV_7hRYkTE#hSa%Z=7Ji?crQ;E z$B>FS$q5pyiyKT1ylC(~Cb-IhwcVy$X^LV>Lu}(jhL7hCWU=rSyC2k$VEw|{S0MI{ ui8)TDF8;7#OBDFeiF-v;PE|%HZkh=d#Wzp$PylD?KOx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json new file mode 100644 index 0000000000..455734e044 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..fc03f154a4a441709f8f788844a3738cf9c45818 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5xIb6XFV_4gNDoZRKUpWzyExp32YvpMfDVGO|40P)ke85TuUb^W)Eo ze9Cn|7H>(AUogXeB%sUUxE3gJ($mE;q+(8T0s|u>n~y@n>PLq3w+3!9@#NR9L4*h*T{6AY&jJvhc%(ip8w0 z=8X-~8)i1FV(8{%x$AI&r76$hBdhu{n`;+b8TDF31WX!>SiLzkC0HXEl+7F&gG3B8 z6HYDe;7rzDGND^yDuWK!oC!B__##A96gD2-sHvfvz{I_Y^UZC;&;sS>qGD`iKFTs5 siVPXIO`32{ZNcwH42sO|2Lo6beCi~pP7VpO26~FY)78&qol`;+0A|K?asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4e47d5e071805c71faf7836e6de6db0ff6d80d05 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_4gNDoZRKUpWpZ(L{?EV=85yaqt$j_OLlY>+Q4-`A%Dwox_^vgBX_GkS)+GXurg|L*&7f16#T$Fx^?#&?wa8rXmp3XszRRP-B6XLV%Tl zftEl3o32cOn39g8#w!Cyt0~7qJ2o6F*6-_i+?SAa)M$C<*clX7~>Q zS5Ji)0mb?~T^vIy<|HRbuzq3c`LUE$Vg}2Htnh>cqeIIbA{!eWRT;M1tQPL@IlguQ zkIyF22b0qM8!oKeA=2WQX%@52<3Pd$wg^s54rPV&UMC(IF@4%#Ai=u0;TnT~BcrBf zfw)8umjJ5;H&1E@(;QZ|B^wwRWmwsi7ANQ%OfcrU#>8y7I!V_+sGz8Wd2uW2TSkW8 X?|5zh_ccTUoyOql>gTe~DWM4f`pZ}E literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json new file mode 100644 index 0000000000..0800614b81 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png new file mode 100644 index 0000000000000000000000000000000000000000..e02b108226abf961542b32052dc1c4232f40a7cb GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x0V6XFV_4gNDoZRHhfyb*E(1fzZ=u_Np6~_&^)q<7`njxgN@xNAHlIO` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e24ea9ce255a5b049b568e4db7acb2b1505d91 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?4j zBOuH;Rhv&5D5x0V6XFV_4gNDoZRKUpWzyEx{?EV=85tSwpgNVG-@(Bl-btqYX}%WQZXkvL4tL0gNj0nyPu#+zRaAWQ$DAY_((C}v86cMxFmuvzX>w&Xrnu>?{ z7bl4H_#DtsX_$Wgz=0I8hC|^-uIA24+*djJO-e-dRw(JH&d`#$G_iu0M@K@-fG08G ra6qHlp+{|*ytBC2d9vLYSs56F{|lvGy)?4~=t>4pS3j3^P6