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 42647a9d00..47488959de 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/base.png differ 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 be9f287abf..66bf70c37e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/icon.png differ 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 63af10e6a4..090734e292 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/mag-0.png differ 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 e088f64bfd..a49a7a90f7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png index ca0c73780a..86b198623c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png index f33c3d8a89..c38916a8a1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png differ 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 4123df3b2e..61e29690ee 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png index ebdf9d305e..9a09dff014 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png differ 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 c48b441a61..0ea11e75a8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png differ 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 777c25475f..c9f1ce49e3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png index 4917f158d7..34f9741a5f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png differ 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 1c0efd411a..50feca5bb6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png differ 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 c91e0b1d1f..e30d896202 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png index dd4c24d90c..482ef1fd1f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png index 128e7da1be..097bee452b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png differ 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 b4b511cb8a..133fc41a80 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png differ 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 11c3bef79c..fa9fd976bf 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png differ 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 f909b598e7..1a06d11129 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png differ 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 0000000000..451406ab1e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png new file mode 100644 index 0000000000..b3381fb2bf Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png new file mode 100644 index 0000000000..0fdfd47b98 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-left.png differ 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 0000000000..7b3b020f96 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_shiv.rsi/inhand-right.png differ 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 0000000000..648fff08e4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png new file mode 100644 index 0000000000..70df3922a3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left.png differ 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 0000000000..ee343bf4be Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right.png differ 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 0000000000..fcc238e206 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear.png differ 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 0000000000..6877ed50f1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left.png differ 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 0000000000..55bdd73fae Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png new file mode 100644 index 0000000000..5960b25537 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/equipped-BELT.png differ 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 0000000000..e98557d62a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/icon.png differ 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 0000000000..89547bf155 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-left.png differ 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 0000000000..a5cbe99193 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_shiv.rsi/inhand-right.png differ 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 0000000000..e194aff0a6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-BACKPACK.png differ 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 0000000000..b6cfc5e2cf Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png new file mode 100644 index 0000000000..3acb387c7c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right.png differ 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 0000000000..3bbf3be8dc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear.png differ 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 0000000000..988df02ef7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..11b3e3d3d1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right.png differ 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 0000000000..e3c69de10b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/equipped-BELT.png differ 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 0000000000..87be907349 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/icon.png differ 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 0000000000..d2e5a28123 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-left.png differ 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 0000000000..a36da4037b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shiv.rsi/inhand-right.png differ 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 0000000000..be1468364c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/equipped-BELT.png differ 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 0000000000..d5a566bd72 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png new file mode 100644 index 0000000000..e2734410ae Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-left.png differ 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 0000000000..97a2f4917d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_shiv.rsi/inhand-right.png differ 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 0000000000..fc03f154a4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-BACKPACK.png differ 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 0000000000..4e47d5e071 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png new file mode 100644 index 0000000000..a9c616c7ae Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right.png differ 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 0000000000..e02b108226 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear.png differ 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 0000000000..f6e24ea9ce Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..28e4f0c1fb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right.png differ