From 2287f59e8a0aff8cc2239902536940a3f6ed724b Mon Sep 17 00:00:00 2001 From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Thu, 9 May 2024 22:58:15 -0400 Subject: [PATCH] Adds wielding for all large guns (#26970) * Adds wielding assets * Modifies meta.json files and adds artist credit * Adds wieldable component to a bunch of weapons * Moves shotgun inhands and wield inhands to their own folders (because its the only way the sprites would work) * Removes the wieldable component from some guns * Adds wielding sprites for wieldable guns that didnt have them * Adds gun wielding bonuses and base innaccuracy to wieldable guns. * Corrects wielded accuracy to be default accuracy instead of perfect * Makes the drozd smg and bulldog shotgun wieldable * Makes nukie c20r wieldable and adds sprites * Adds BaseGunWieldable * Makes all the newly wieldable gun use the base inheritable * Adds accuracy to smgs to resolve inheritance conflict * Makes all wieldable shotguns require wielding to fire because of a bug involving spread innacuracy * Adds wield bonus message on examine --- .../Components/GunWieldBonusComponent.cs | 3 + Content.Shared/Wieldable/WieldableSystem.cs | 8 + .../en-US/wieldable/wieldable-component.ftl | 3 +- .../Weapons/Guns/Basic/base_wieldable.yml | 12 ++ .../Weapons/Guns/Battery/battery_guns.yml | 10 +- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 8 +- .../Weapons/Guns/Shotguns/shotguns.yml | 33 ++-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 4 +- .../Guns/Battery/laser_cannon.rsi/meta.json | 146 +++++++++--------- .../laser_cannon.rsi/wielded-inhand-left.png | Bin 0 -> 1039 bytes .../laser_cannon.rsi/wielded-inhand-right.png | Bin 0 -> 1039 bytes .../Guns/Battery/laser_gun.rsi/meta.json | 78 +++++----- .../laser_gun.rsi/wielded-inhand-left.png | Bin 0 -> 807 bytes .../laser_gun.rsi/wielded-inhand-right.png | Bin 0 -> 803 bytes .../Guns/Battery/pulse_carbine.rsi/meta.json | 78 +++++----- .../pulse_carbine.rsi/wielded-inhand-left.png | Bin 0 -> 792 bytes .../wielded-inhand-right.png | Bin 0 -> 805 bytes .../Guns/Battery/pulse_rifle.rsi/meta.json | 78 +++++----- .../pulse_rifle.rsi/wielded-inhand-left.png | Bin 0 -> 792 bytes .../pulse_rifle.rsi/wielded-inhand-right.png | Bin 0 -> 805 bytes .../Weapons/Guns/Battery/xray.rsi/meta.json | 100 ++++++------ .../Battery/xray.rsi/wielded-inhand-left.png | Bin 0 -> 1551 bytes .../Battery/xray.rsi/wielded-inhand-right.png | Bin 0 -> 1578 bytes .../Guns/Launchers/china_lake.rsi/meta.json | 12 +- .../china_lake.rsi/wielded-inhand-left.png | Bin 0 -> 839 bytes .../china_lake.rsi/wielded-inhand-right.png | Bin 0 -> 863 bytes .../Weapons/Guns/Rifles/ak.rsi/meta.json | 18 ++- .../Rifles/ak.rsi/wielded-inhand-left.png | Bin 0 -> 1198 bytes .../Rifles/ak.rsi/wielded-inhand-right.png | Bin 0 -> 1192 bytes .../Weapons/Guns/Rifles/lecter.rsi/meta.json | 12 +- .../Rifles/lecter.rsi/wielded-inhand-left.png | Bin 0 -> 832 bytes .../lecter.rsi/wielded-inhand-right.png | Bin 0 -> 822 bytes .../Weapons/Guns/SMGs/c20r.rsi/meta.json | 10 +- .../SMGs/c20r.rsi/wielded-inhand-left.png | Bin 0 -> 679 bytes .../SMGs/c20r.rsi/wielded-inhand-right.png | Bin 0 -> 671 bytes .../Weapons/Guns/SMGs/drozd.rsi/meta.json | 74 +++++---- .../SMGs/drozd.rsi/wielded-inhand-left.png | Bin 0 -> 719 bytes .../SMGs/drozd.rsi/wielded-inhand-right.png | Bin 0 -> 709 bytes .../Guns/Shotguns/blunderbuss.rsi/meta.json | 10 +- .../blunderbuss.rsi/wielded-inhand-left.png | Bin 0 -> 949 bytes .../blunderbuss.rsi/wielded-inhand-right.png | Bin 0 -> 964 bytes .../Guns/Shotguns/bulldog.rsi/meta.json | 12 +- .../bulldog.rsi/wielded-inhand-left.png | Bin 0 -> 802 bytes .../bulldog.rsi/wielded-inhand-right.png | Bin 0 -> 803 bytes .../Guns/Shotguns/db_shotgun.rsi/meta.json | 2 +- .../inhand-left.png} | Bin .../inhand-right.png} | Bin .../db_shotgun_inhands_64x.rsi/meta.json | 27 ++++ .../wielded-inhand-left.png | Bin 0 -> 836 bytes .../wielded-inhand-right.png | Bin 0 -> 842 bytes .../Guns/Shotguns/enforcer.rsi/meta.json | 2 +- .../inhand-left.png} | Bin .../inhand-right.png} | Bin .../enforcer_inhands_64x.rsi/meta.json | 27 ++++ .../wielded-inhand-left.png | Bin 0 -> 775 bytes .../wielded-inhand-right.png | Bin 0 -> 762 bytes .../inhand-left.png} | Bin .../inhand-right.png} | Bin .../meta.json | 27 ++++ .../wielded-inhand-left.png | Bin 0 -> 867 bytes .../wielded-inhand-right.png | Bin 0 -> 877 bytes .../Guns/Shotguns/inhands_64x.rsi/meta.json | 51 ------ .../Weapons/Guns/Shotguns/pump.rsi/meta.json | 2 +- .../inhand-left.png} | Bin .../inhand-right.png} | Bin .../Shotguns/pump_inhands_64x.rsi/meta.json | 27 ++++ .../wielded-inhand-left.png | Bin 0 -> 905 bytes .../wielded-inhand-right.png | Bin 0 -> 922 bytes .../inhand-left.png} | Bin .../inhand-right.png} | Bin .../Shotguns/sawn_inhands_64x.rsi/meta.json | 19 +++ .../Guns/Snipers/bolt_gun_wood.rsi/meta.json | 12 +- .../bolt_gun_wood.rsi/wielded-inhand-left.png | Bin 0 -> 714 bytes .../wielded-inhand-right.png | Bin 0 -> 733 bytes .../Guns/Snipers/heavy_sniper.rsi/meta.json | 12 +- .../heavy_sniper.rsi/wielded-inhand-left.png | Bin 0 -> 1719 bytes .../heavy_sniper.rsi/wielded-inhand-right.png | Bin 0 -> 1665 bytes 79 files changed, 569 insertions(+), 352 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/db-inhand-left.png => db_shotgun_inhands_64x.rsi/inhand-left.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/db-inhand-right.png => db_shotgun_inhands_64x.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/enforcer-inhand-left.png => enforcer_inhands_64x.rsi/inhand-left.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/enforcer-inhand-right.png => enforcer_inhands_64x.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/improvised-inhand-left.png => improvised_shotgun_inhands_64x.rsi/inhand-left.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/improvised-inhand-right.png => improvised_shotgun_inhands_64x.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/pump-inhand-left.png => pump_inhands_64x.rsi/inhand-left.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/pump-inhand-right.png => pump_inhands_64x.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/sawn-inhand-left.png => sawn_inhands_64x.rsi/inhand-left.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Shotguns/{inhands_64x.rsi/sawn-inhand-right.png => sawn_inhands_64x.rsi/inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png diff --git a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs index ce96639e3c..522319ccbd 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs @@ -33,4 +33,7 @@ public sealed partial class GunWieldBonusComponent : Component /// [DataField, AutoNetworkedField] public Angle AngleIncrease = Angle.FromDegrees(0); + + [DataField] + public LocId? WieldBonusExamineMessage = "gunwieldbonus-component-examine"; } diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index ba3f787a4b..778a664e2c 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Examine; using Content.Shared.Hands; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; @@ -45,6 +46,7 @@ public sealed class WieldableSystem : EntitySystem SubscribeLocalEvent(OnGunWielded); SubscribeLocalEvent(OnGunUnwielded); SubscribeLocalEvent(OnGunRefreshModifiers); + SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(OnGetMeleeDamage); } @@ -95,6 +97,12 @@ public sealed class WieldableSystem : EntitySystem } } + private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args) + { + if (component.WieldBonusExamineMessage != null) + args.PushText(Loc.GetString(component.WieldBonusExamineMessage)); + } + private void AddToggleWieldVerb(EntityUid uid, WieldableComponent component, GetVerbsEvent args) { if (args.Hands == null || !args.CanAccess || !args.CanInteract) diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl index 91eee8c2ea..84b58224a7 100644 --- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl +++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl @@ -1,4 +1,4 @@ -### Locale for wielding items; i.e. two-handing them +### Locale for wielding items; i.e. two-handing them wieldable-verb-text-wield = Wield wieldable-verb-text-unwield = Unwield @@ -17,3 +17,4 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded! +gunwieldbonus-component-examine = This weapon has improved accuracy when wielded. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml new file mode 100644 index 0000000000..cf858e1737 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml @@ -0,0 +1,12 @@ +# A basic inheritable template for a gun that is wieldable and has the standard inaccuracy. +- type: entity + id: BaseGunWieldable + abstract: true + components: + - type: Wieldable + - type: GunWieldBonus + minAngle: -20 + maxAngle: -30 + - type: Gun + minAngle: 21 + maxAngle: 32 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 529e883638..5e7bb82365 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -200,7 +200,7 @@ - type: entity name: laser rifle - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. components: @@ -267,7 +267,7 @@ - type: entity name: pulse carbine - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponPulseCarbine description: A high tech energy carbine favoured by the NT-ERT operatives. components: @@ -298,7 +298,7 @@ - type: entity name: pulse rifle - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponPulseRifle description: A weapon that is almost as infamous as its users. components: @@ -325,7 +325,7 @@ - type: entity name: laser cannon - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -380,7 +380,7 @@ - type: entity name: x-ray cannon - parent: BaseWeaponBattery + parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponXrayCannon description: An experimental weapon that uses concentrated x-ray energy against its target. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 594ffb4d4d..728783fb3e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -22,7 +22,7 @@ - type: entity name: china lake - parent: BaseWeaponLauncher + parent: [BaseWeaponLauncher, BaseGunWieldable] id: WeaponLauncherChinaLake description: PLOOP components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index bc3b65ff3a..c034ac5749 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -1,6 +1,6 @@ - type: entity name: BaseWeaponRifle - parent: BaseItem + parent: [BaseItem, BaseGunWieldable] id: BaseWeaponRifle description: A rooty tooty point and shooty. abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 2d6e768c41..f5193164e7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -80,7 +80,7 @@ - type: entity name: C-20r sub machine gun - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseGunWieldable] id: WeaponSubMachineGunC20r description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. components: @@ -94,6 +94,8 @@ - type: Clothing sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Gun + minAngle: 21 + maxAngle: 32 shotsPerBurst: 5 availableModes: - SemiAuto @@ -111,7 +113,7 @@ - type: entity name: Drozd - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseGunWieldable] id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -125,6 +127,8 @@ - type: Clothing sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: Gun + minAngle: 21 + maxAngle: 32 fireRate: 6 selectedMode: FullAuto soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index f43df5f37c..a19ed1951e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -46,7 +46,7 @@ - type: entity name: Bulldog # Don't parent to BaseWeaponShotgun because it differs significantly - parent: BaseItem + parent: [BaseItem, BaseGunWieldable] id: WeaponShotgunBulldog description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. components: @@ -66,6 +66,7 @@ - Back - suitStorage - type: AmmoCounter + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 2 selectedMode: FullAuto @@ -101,7 +102,7 @@ - type: entity name: double-barreled shotgun - parent: BaseWeaponShotgun + parent: [BaseWeaponShotgun, BaseGunWieldable] id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: @@ -111,8 +112,8 @@ size: Normal shape: - 0,0,4,0 - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi - heldPrefix: db + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 2 - type: BallisticAmmoProvider @@ -134,7 +135,7 @@ - type: entity name: Enforcer - parent: BaseWeaponShotgun + parent: [BaseWeaponShotgun, BaseGunWieldable] id: WeaponShotgunEnforcer description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. components: @@ -143,9 +144,9 @@ - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: Item - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi - heldPrefix: enforcer + sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi - type: BallisticAmmoProvider + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: entity parent: WeaponShotgunEnforcer @@ -157,7 +158,7 @@ - type: entity name: Kammerer - parent: BaseWeaponShotgun + parent: [BaseWeaponShotgun, BaseGunWieldable] id: WeaponShotgunKammerer description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. components: @@ -165,12 +166,12 @@ size: Normal shape: - 0,0,4,0 - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi - heldPrefix: pump + sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/pump.rsi + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: BallisticAmmoProvider capacity: 4 - type: Tag @@ -189,8 +190,7 @@ sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Item size: Small - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi - heldPrefix: sawn + sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi - type: Gun fireRate: 4 - type: BallisticAmmoProvider @@ -240,7 +240,7 @@ - type: entity name: blunderbuss - parent: BaseWeaponShotgun + parent: [BaseWeaponShotgun, BaseGunWieldable] id: WeaponShotgunBlunderbuss suffix: Pirate description: Deadly at close range. @@ -251,6 +251,7 @@ - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 2 - type: BallisticAmmoProvider @@ -260,7 +261,7 @@ - type: entity name: improvised shotgun - parent: BaseWeaponShotgun + parent: [BaseWeaponShotgun, BaseGunWieldable] id: WeaponShotgunImprovised description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: @@ -272,8 +273,8 @@ size: Normal shape: - 0,0,4,0 - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi - heldPrefix: improvised + sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index c97459629c..252eecbd06 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -40,7 +40,7 @@ - type: entity name: Kardashev-Mosin - parent: BaseWeaponSniper + parent: [BaseWeaponSniper, BaseGunWieldable] id: WeaponSniperMosin description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. components: @@ -49,7 +49,7 @@ - type: entity name: Hristov - parent: BaseWeaponSniper + parent: [BaseWeaponSniper, BaseGunWieldable] id: WeaponSniperHristov description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. components: diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json index 6657216b76..acbd06c270 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json @@ -1,77 +1,85 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "0-inhand-left", - "directions": 4 - }, - { - "name": "0-inhand-right", - "directions": 4 - }, - { - "name": "25-inhand-left", - "directions": 4 - }, - { - "name": "25-inhand-right", - "directions": 4 - }, - { - "name": "50-inhand-left", - "directions": 4 - }, - { - "name": "50-inhand-right", - "directions": 4 - }, - { - "name": "75-inhand-left", - "directions": 4 - }, - { - "name": "75-inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "0-inhand-left", + "directions": 4 + }, + { + "name": "0-inhand-right", + "directions": 4 + }, + { + "name": "25-inhand-left", + "directions": 4 + }, + { + "name": "25-inhand-right", + "directions": 4 + }, + { + "name": "50-inhand-left", + "directions": 4 + }, + { + "name": "50-inhand-right", + "directions": 4 + }, + { + "name": "75-inhand-left", + "directions": 4 + }, + { + "name": "75-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..38327d9708153b706131699d5862e3a06dc9ffe5 GIT binary patch literal 1039 zcmV+q1n~QbP)3^|MQGYZD8%lHf`!sAH)#JP)O=ENAade7$G`#m5t88Y+EH%`9I_W}e#5ClOG1VIqQ{|}Zn zsOvg+97jBNyIuTg82AIgU%*1ERjatVx&i9B4Ee8~|L`MLwU0>$;F-89%DkR3TZG#k&At zSr!L?*=z<$l5lx>iO0vstpg~PN_cyFV=pf+C>D!ieBEKxYPE&u_xE=e1OYD;3TQMM z{Qmxa=@9mk13?gozU#W8FUxZ3FYR4LQA9tV&qI==)sdzkNfPq;JWfwf(d+f1`Fztl z^S$#R2yk zi|KT_u1plzO9xP?RG8y9sMTsbZ9=Qn0`TiZqc*yJxm=EY zeSKj(9z#(S*tWg#pGzW15^UQRH|g;35CGV`UCDeeEZWn-!2xQu8XU)Al}bhIJx*$3 zXf~VheV?nU3ez+ZZ->KSs`xzV;QIQSJv=-B0LtYurqe0HFyz}N!AvH@_V@QO8jbkz z@i9iD5qo}qUOUe;P0?3XRm7nv3ai)asdG|40pItL%jKAD+qk&6faiHoRh65j3EQ>- z0R4U+XJ=>0sm!u0@zCjXq6GHs;G=cIFvNH~j)LE2E|2tl-vUpP%zgCd0xo#I`qpAP9mW2!bF8 zf*=TjAP9mW2qMnf!icWx3-v+AanS8{p&Q1MKOm~X$7}oBl*7`rH|fQRN^{%luB;9N zK)c-r@UtphDwTv+K#O?=B7Z=kP!Pt3QmM3)Cm_ity?D^OYA*Q$lB_C|C;b7yFJHhe zo`7|%(o56aR(I_U0DxRBC;HK0#JvG=k3i%L*u@i&#wNYE7hzY;wFl5@wV1B!+%ODy zp0{8@X|-BQ9svMox7(~-E^qA#NTO*Pi|3%YUUmLS_`WZ`_gytN-T+P0SY(#SX0yU4 zko4mih9UaD|Ufhb)>2z4aT=gx!oh_@?DhGgiy$)4X#k@+T!lNtM@Av;v=1+2a zd%IxLXf~S*zJwqM&~CSXo8C@Dr@qVS|C=-kf*=TjAc+4Oe*<`u`jpW9#1H@g002ov JPDHLkV1m;)@o@kE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4e0a357b844b7fd424b32f4020defce095f8a0c4 GIT binary patch literal 1039 zcmV+q1n~QbP)AkqV+NDwi$;+4uS0f*=TjAPD0B2TSX$ zR4QB?udS`I&(BZjx(;2}x$C+BfcyJgozN zH#eEVi1ALR6YBtA&1Q4yg;gpQ0EpLN+ji<&*RyU=tybYU4x%XH0MP68pzAsS!1FxF zvW%K(rp}dR8J_1s(=>RVhjO`$Mx((;qfu%Qf{%|6G#U+_&|o_|JE+&|@ipysJ9GYY z(J_aIhirFumk$Pm%sFdmosuL$)3o?pQIz=D^St<2mgUr6+O=UAVltUz1_A(+$pm2- z#^+B@PiQuqqK_xXvf>87B}sy9+c-ElfTn4pKb6!S5JeF@&qEYNP!t8e@5f0<1`&oK zWLb{e`SDd44u?29JDWLACN~R3Q7{^f001v9FBpwRh@vR-`qTtSk_5+bpePD^eSO9D z_BK>i1pscE=FBz}3l76@W~(M~U6);4T%cB~6><%at3K);a{NdqYsr3;AK@bE%5ClOG1VIo4K@bG-vstz<64%@3%VVzV{^l8| zO??8wAMo8Ele)HTGvOb|(@T=4o#_wAqgt)v`uaLPZ#J8$o&n(#m=EZ?nuEb0PR3Vy zgTY{-N_DC~APY&7X1oJQ-#{{md7r?lq@T-D2@rL5$8pf__Zjfd`zd?_A_z0FHCK86g|5&PdP!fxyq>6Do2L1t_P2IG zvevFB3M|WlX__+ziKJIxRpuQYmSz2B#z^Xk*I|*wFO`5SlYt0Icm;&1K^P=fB~90| zEQDc*+uPfCtlRDKR;wk(|C`dd*pkV=s-LJy5ClOG1VQ{X{swd1@9J&m!@K|h002ov JPDHLkV1gKS=@kF~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json index 7ec48da4fe..2b374ec4dd 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json @@ -1,45 +1,53 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..126915fd2703fa8c4f8116298de83399ff913d2c GIT binary patch literal 807 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json index 1a906ef965..023ad90cfa 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json @@ -1,45 +1,53 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b9df7a2cb2de40ba7406aa0912b1e3fbbdd912c0 GIT binary patch literal 792 zcmV+z1LypSP)Lzj9grS$)3rmo2l@IO+>;ELiU zi#!B-a6E)y1Tsdgp}bBfBwJE0L`pNf-}21e(|vcG?{0V>z%UHMFbu;m48t%HLwSzr&Y=8JUBRzUexXFEj;TJUj6)n%hvZOI-_&+`~8aJI0OLw zem_$)p5r(U<>eN|v$RIrw#l|_3W5O5W)tJ_I5#$%O|;u>yng=~AHIG|L|xZm7zXLO z4qexyMK0qwPLw0^!)XE9Uoyn zpQF`kB_aU0t_$UtjV=J7i(aFFzg-*Q&JFgo!$S`EJMr%uH8eQa)SM%rN*Ci=VG zuEg?z_0u!pY;`SJWd6kr!=T}CnCQ1Gi^4EOwOU15+}PNF=Xr^5_V@P*07jz`R8_@n zHpB9`LQhc?Os7-S>vaIY#l^*gk3iZw;-nsdEVj0`a^q|^Tlppkg2XN?7K_xeiMG>g)e zE;m`0MXIW1_AmPboY6Ued_RB;cX<@jbZ>5Mu)V!4r7u+(vTd8z*4A=80>U5g=IzJG z7m()%kk!4*qp<8t5WWIgeW~3MWv<^ZhIsb_@Q;sHa$MJiq9|xI8gN|~s;Z(^t6?&k zq?W_W&=np8QHqz*m!6nm7?kA;5K#z;Gn?lJC_@(jc6WDaI-NpRzfgaGKv9(Fca|TZ z3|*mjAN?Y0?vXdZG);<|CDQx=MQbh-e>qCjU*&&V=ANQe@6mXwUPXps7=~e(C(A$C W$E`fE9NyUg00006I1#54gVIL2g%23Z(`mSQ5PZ9*Vp$p^?-3e6ZwzeJ~I>d+|&@WuqRRE`_rzzKU)oK0}&%VFmN99Ac57>k zVzEfESft%<$F`p5Q7V;GsZ^S1B}c{V@9!rX(ofIFvaE2C2ZTGI+wHQvyo~30 z00cq6?Yk1+3I%R!C29cF`0D$V%Vhv6l?uIHFVd!uj_L0}uh--1>WXwaJxT5W;T&|* zN5^nHKDJh?MXrM&0HE1yva+&5x7&?854VGD+sZHuuCK4j=koxZoSa0qi{m(|-|w@u zv_udDBinkt9*MDSTU}gSOuUt+jT>frds_jtS}n5KEWYofj~jjhH#aw7kmq?LSHbsv z0M^#lV%vFAtyb0U?rwNc59gxi3EB=AoVcA%Cp8FeG#bMzpm>CXY1UM$Rh7wPXti45 zy+)&v(sN8SP}1MspT_Vmh~vq)4z_J8xce{vO`M;f&wC1jAP9mW2!bF8f*=TjAP9o+ zPZ8%8Filg3EfV*1zD6hacf53z}kJR7XJK*_?*NJo&7Z(%j#=a%nw$;YQ2A=1IWpmH-C=?1b zn@xPpE1;A4^qDU^@U(3MFm0K8Sif8@Kf3PN7clS)0A#aS&d$yvo`N{9KoA5|CqGJm zP}O}*-Plh+ucaG?aj&)xv-JuL>(4?r_ATirYD`UiW}X3E-!Kf_uP{HK!n`~Kli2hA jkBJC^AP9mW2*1Zqpt_@unLRm900000NkvXXu0mjf^|*ln literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json index 990ba51185..8766242121 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json @@ -1,54 +1,62 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-0", - "delays": [ - [ - 0.3, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa2fafdff6634a32ccc0f1de31e5fedad0705a3 GIT binary patch literal 1551 zcmV+q2JrcbP)T^Cce^G_nly)AJmMbwH3k)$@3A#=4$WRnfuYWA>=f>6eux`(}Vw1Pt{ zV=of|b{hkQRw%6`Qa2wq8tWnzQ$#6)%A6*V`6rgx+AeF)9+G>So0xyLg|VH_%gw#_ zcYfdB`JF#EaDD)X!{Kl^91e%W;rtIF@i)yj2Od4z!rE$(0)XMu!-Uj7&dSm1r7#w+ zF45wWGNM!#V02{Q1%#VDr|2mxon422INFy|m6j+J%A~knN@zzF3MB+l4**bnOz9CE z#n~@=Vf*|Tj^Ie@--=$;h;;x!H#av)!)vYBy?ZzE^73Q?=@Qdyb7Zv1h5hGCD4kNW zzQwMxL6;?9>(vkmc|wvQ0tUc~S(Ks#-b=F?e?tT|Ha3`8ettewDm5AS;cGP898|AA zC=*XauRnUUt9oZI}f7f3W@(Hxwu7%M$S0 z`W$WXH9-d*7O(&vbh!H2b@=^$sOPi*0DDUt+^!+mTiReYTQE84l{qwWboS9^n**Jlr{Q$=vCeJB{QOB~YW$5&-acZlIyz81;B=q)p&`br|_8 zh4j8UO!`SbJ{bKF7GE{%kE>%WNne%#y?BVYI>x9difHXUfdwp}wf96c35X`a?HYo` zR}Hse2yWMqEC5qo1A2P8aR7EqS%H0xUKougOixe2>Fi4vJ43QF8chfW1MGQEPdBXA zV;S48R0Xkjr2qhsr_6^A8a9Y}@eo5dfsHuzg)Kk@6tFBAY& zlT|o({v$Y@eN>@{?XpUca5%&^B2!%h0)ZvwTiQD^5pNfXL?{4gwSwfAND0mkim6*3 zcBd6|Ny(QzNZdsM$VXJWAHm=fOOUh?#?~!~jWh*73JPDrzI~;#(bsDClOM0APQvjM zZ8HC+x(4xM z2!&P?*KCe6fWzT%I2;a#!{Kl^91e%W;cz&d9Z^$TPvcK+vVHe&*W8uKpxNf2%{B)W zL_Gvik1pCph3*R4Py4CRT|v8O7hQXA9fGK5w$B<=yk@)4hD1G~yMo2@ta@1;jAWZ> zLDWn20RVuaqN1d;xNOO!nW*Kx=_XP#a?wnz5J^IFvYfUL+GOFI`P+>NH;aR8vXCP8zuoLUB}ncf?Ucj0yo;oSKPDYc61(auZt1=(t5Wn?;IrBc0s z4my0(aZz?$?lsKH?DyuE0Eo^2Ah!{T*EIH4GQF0;rX-zst;WXJF+DxSo@c9>)gF*o zFCcZk-DhL90yDQKh;*1)Sy_b#_t&$o2}q^6Xy3wR!w6aio8amgL%YugAbMyj9kY9H zx{3Fuo8(%DAdzti0MX-V35`YzqtOJj*@7<&XVBt%Ix^p1>?N@PDS)hw!_#Rptzio= z2wXOdKoIpzXS-U1Ts1Q$V02`F#BWH6qUVM$&_%Hif~aTfPAYB5wk9BxrrR|H`(zvJ zEmbg^EkNu9I)0iztLBc7zQtFrjkC{RO>I4GwmInY{%;`p+fEONE}M9pZ2j)&6O|Yk z@N{ORn=Q|an%a6Qi29_N@}hM)91e%W;c)&_`~%q2yDEZw`!N6j002ovPDHLkV1jPh B-4Fl( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..63615e2df1f4c9a87579b8e5439b64bc820495c9 GIT binary patch literal 1578 zcmV+_2G#kAP)wXIF*y0Z_-z22lryvZDUJ3k2b zV18|TE*(gJ2@ex+OXRT0erm7>n+@H+5c z+@JtZrqPn3qGA9*f8Uw38UV1oyoBi~fdYVjkCs%qH=~F2DALP^_2~v75{t#Ky1I&m zg$0z9l+a>*3HYKB>aID2Yq*BK&j;cDG|PF-HR!%Ih~3e|FeURqj;a44AfAk6hVA6b zQ|_c^k}@C|yhB~Cb^xGLQ&G5F?HJf&#f8^^Qy&k(@AtuEGE4S5cUs{0`_St-54)oU zy`J*`fM~4%yi_`d<63COtKqfZ#-x1-Ui)om#;akRvqCjqK`WQH zrX5J-@>ZzEE2weKDm_m}HUIz~l`jAQNgOjWG&BeRByj`)L?Qyhpkrv$?9}E#09Ugun;RND^$L2jRl6YPXYN{1_1L*O-b#lXVpMr zMW6p=8OPmS@E`HPkN8^fa^tI{tgHgD*bGmq=1H-q_s&LAaNc1rHxilZE*?(P@(SL{XQkU0ML80c)#> zAlysJm{hW@;=Z>ZM5i}EtF6T7$W;me zo6E|{%ycxb0Y7cT0LbsD)fzH8J0)HJo#SIL7z_r3!C){L30~mQaplTS0Dwn}Giz+cE%W!!zKaP=;QFCk80{L$IRivZF#}SyEPS0* zJrb=IBt5YvL5XHgYk<6Vz<0Hm_^$R6Af9UChGZ+x!P7PX$Ju6_Yv{wIeF>WJYUH~H zm`r9oTAV>mO)Y@f3P1tJkatPRMCRL!x#FcCL5eGNC^;Nw9)?(ULm6XZ1sN;DM*0C>E| zp4zdz4#)5J0Y`vio==i&@?8YeX^MK>#e?VxSjqmqR;f+?2~?t)Qvgy64C;-IR1|T! z+HvgYW2f_VSWco3$)R+5@_YH{=471i55`zvnAkWc4TpkH#px&MiW=g*ze9KrFaQ7m07*qoM6N<$g6f&~W&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json index a5e32a3b39..d3b991783f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 @@ -21,11 +21,19 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 }, - { + { "name": "equipped-SUITSTORAGE", "directions": 4 } diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a1d40617d2f4fb2a9409429c7f90eee58db53d0d GIT binary patch literal 839 zcmV-N1GxN&P)3W7j&J&#WC zJWrYJ|HKDd!ypKh>$du;sJg8&7=pTsHKh9H}2A?|@dPIweioQkZkDilTV&e&nru z#Krm}Ao%K8FGiHMk9!M^M*!G7Xi*f7xd`UjH$QA0dW`N*3pjO)`|j~MR9zPBdMrT@ z1VIo4K@bE%5ClOG#8wG{Ky^_leHR*qt}4a5ifgS8FzIR+I@2iV8arc5{ml$8Yx}#3 zYgK8{dVwg4(C_yf?Y6B8u+b?T9UZ~8a9W4;5zvzu4u=pzK&Rq(JO%&=A$F1#S(ZTv zvHX?eCQ0%p|JE6x`-gk7q8Hfz6rk7ZAxRRPBZZ9?zy@6`tEW2q6C&*!*K;e?*8*LLb+4F&`B`+c09p5W~Cq>}!}e6vEV73L-A zbEqqSRkZXul=&V2u6!u7EdE+_EVDIZ)rp^UY}@!-zqF*3&Xo_ft(v}BA=W#)PGkYB z*CJ?I^#PkArF0l$>Y=dH^Vnd1#I$I$TrF0-#%`x{S=T2`0YMN1K@h|S`~e~EY@1{O R`O5$R002ovPDHLkV1mQ+iiZFI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..146fe9b1c2a5d6cabb2a362206a9539dbd14dfa7 GIT binary patch literal 863 zcmV-l1EBngP)4z!6vzKAC4(kSMzjuSNrq6uK{OcKV!iFN7@ch0z4xRio#Fiff*=TjAP9mWHl<##>w3Me zx9!K)kW%V&`xtR&}Fvc`v>{%I6rSVGe!q_- zNt|sl#JF^uiw4{0HP>D6h#1lUq7y(I1t2` zwVVU@F#s@Ee`ef|25b9ySU=PBByv6mo*HQ-f64+A$7==1J2>{S)HfGmh7|t@_ zLwJSH#{x$|h&?rLF$!@PIr+YT;=nkb_p^@YF&qvnfC<`uXZ`9=md7tVv?rmDxVhd_ z0>>BO!td)2rv04+z6AOcEVXx!?Ad3){!Zc?be3}udQXX2|7T#{O4spnW-oL+4z2jS zpB>CO*Kr)@I%T&|nxa8$g2$nKX|AtRSro($TfhzkOh(vAcq({cJHck*oa=EMSNapP zm^PO5!aCt`=v6EFn)n}LAP9mW2!bF8f*=TjAPC|Gvn_pql=5Zh61Jre*u?IeG93{@ zU|TEkA~WD$)%nwQtxZ?E8&z`J?Y6$Xz0Li-h&I55b*Uaj5q#fww!6_5u)&|4oB%Le zKq)o*6x9Z-LrSTwRv~M*)9C;JE-x>gpXanPdAfmiyRE0wDFEQ+<_3VN5@&S+o7N1| z_D7I7I5@y`I$fzrxO<#y5lYPf#et(tfpIt-R$9#lTFnNk)hZ4T523iJ$NSQ>&n`;l z;7c?4R*=zZHgauMtJQLhT6z+?C!x>1ekDGDnwha5$cGi|1V{QGFLolry zSfv_CI||H8(m**Sb6fBKGDd|lrpr83okdc1pLrZQFQ|2svnkiHS^cu#C{7cQ3V17j pHvZT*vYBNK6hROKK@bE{gx^ttYXad@^h*E$002ovPDHLkV1lRng{lAm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json index 919d0f87ac..0257e70364 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 @@ -27,13 +27,21 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2fa1f7811dc72a21165b78d671f64fce8ded6fbc GIT binary patch literal 1198 zcmV;f1X25mP)QB_M4sA-5F~MRE9P92+o>o>5l@V&z+0FY(b^_<(@ z-kuQSc0GmbFc=qEbxe<+sI>`5B_+n!xm*^bqocxw3vVI4G|%J+@ZPW)^vrDy?H@|G za^*4r;OWy}tu+7`MhPpc%MM572rS#mK3s#S-X}-E?!F2^l12ca#%?_x$ssnRn2Eai z^-UZd{fUi@4Hk{YtUa4sY0J(zzOV-Y0DF7CvG&a+3C;5-DtL9!YqcH&Zxi3~@(~I9T6^;4t=8;NDEENqY>i5yk&dx5D zmTqBoW{w#~3Hf}%N<#7QK(O0*z9=)X{0&j|0abU`6oX)L#9XU-OGO*6}Oef=I3MX`c^UJkr}S`khve@;d>_uGF{b?=I72G-pNZX5i!BR082^)#H}z`vEf%O4(Mw?RP)_8?>BMQeq#xAM;(>1VIo4K@bE%5ClOG z1VIo4@h^tAq}@m*C3e!DR%oBKu4})I&kOKg`e0mSpOjSVx!a7uX?plx+JkYC*=H2$ z={BS3+8NSy9TzXYi&Ro#xm*@)&s2Sv@zdzqHLJ^?Yx~u0s5$C1Xl7WFMi^j@)x3Q97q~d@^PdIPx?GdbBs9aRy2JIT zzKL-aj_*J#un%K!RG)2l&Z*}E0AO}zt|mZxx%!<6XjYRWN5GVQ_?|@o&Zq+TfCS(y z*Jj^+znVPh{Hx!HZc_;`j1nF`e1zS-Y|8@mquI(t69hpJ1o7YHAH5$Ee(11|*#H0l M07*qoM6N<$g5mK#q5uE@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c358af57c3216ba0aa07aacc90535694f3ba911b GIT binary patch literal 1192 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 Ap#T5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index 8b1af3c504..2ff87fa291 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -45,11 +45,19 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 }, - { + { "name": "equipped-SUITSTORAGE", "directions": 4 } diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..50b0e2a1d4f1e56c093a68d09cdbf72a3f9d726a GIT binary patch literal 679 zcmV;Y0$BZtP)7&kHPC)nv=G=>hcJ?X_hht5(Qn5B4qgq ze8rxTgYqE^+1+U8*BD250D}qA3_u7Wgb+dqA%u7nLKq>0`RMcLYcgc85W)mO0HqXc z3jjq?42t`nzWWTCPNxO{;y4BXgkgBp7DdtSD}*pU6XHHiaU7#8%bQH>w;_YevP7Qe zh@uEh)3n>JG)>WWX$T=qnx+7NAPA5o34$OPa;j%}O~8J?pBQ7HwFYAh+wB%gDKN&c zUaybt(&2D`*1A`Gt#vyt3`6X8yY}fCo7WO>UAwrZX}sdvakj0h$}7$_-b;Wn*0yzB zPi()-_r$BJ0%HtSRiUaX)OCH67pwOK6h$#%j6rJ+DWzF1mjD3HdAr_UULTE}pgytf zg#P;d1B@}ORx3y;Kj&Yp5W;ZIjlFQ&e|~xx{9Pb~Fwaj9NAd5*SRY0A_;E!DA%qY@ z2qA=)}32Gs|g5=9a6JV(J+?>lkckk|Eu`s|}c6m0NUCk_yz6AOf zLyR5QO~>1J#3iFI0eh$Fx}Lao14HurcC1acyZx>|e}A_7-RfqXC8car*;$qu+aD`F z=iEpsO_pWtaooCrm)FOSE!A@`_EtIlZd}_RqaNX|ed&uQgb+fAmw(<rmk>1E)$wRhojGY;x8@uGs;NNMMN;h?C{)B5Xlrcl34BmniA>{l6 z?oiova=_h1+#RjnX91hw9~hJ2J%BOB7-Nhv#uyuAlAKJ+z`=lMn5 zY&JtxRcM+foX4F^g_IKW`5aP806?DS7}~a-55QWB)9G|kw_2?dAq3jC#b&dC5CYa( zIOis_`oN#Ja<|(dP17(BYi;lEd$&N-G>__r8k&l#s*q(_D0j^x*7*hifH9`CUI>A@ zt`i|dC{IaU*NHI(#ux}8dgtMFJ^(+#pTE9@y+cF}02Ye{ilT7VS_mN~_b*Tsg*V^HloDEN=OeOXh$nkp9!pn0WB2i59D8SsF~->c;5TCvL*pu6L*xJe002ovPDHLk FV1naXLe&5O literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json index 25feebd92c..bd66b2c968 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json @@ -1,42 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ee66cf3df9bc020ce409eb59f3264ab28ec8eec3 GIT binary patch literal 719 zcmV;=0xuzkdD%0QmCl zd#bJLy87|)G53PFuDf+56^Zkj4`n(xn@yaZonbf};_iNeyZZ@-!(pmTrBVT7EZ4SR zjOic)oN(~SS%I?kHr|%)oL|4UM`p5 zoWuA1qhA4qw!pfFhXcODQeRd9vSy5W3N5 zAc~?~mu?t_mRYnYimXnjgKoE5W~zS<=Ukgb5JG6r^Gg3O5JG74h$Vy&LI@#*5JCtc zgb+f=`?9NMpiJ$+vE#j|tRzO!>`Wovo z%~(>(q;1~1f}<}$v)N4E-`!6D0Jd#oJRSr1eK`Z$Y4lx8ThrIJ?Ih;u>1k>#!_*N> zr&Cj#0LGXO!*J(#M_+)ar>Eq7^y4RhbPd7t^Yg*6OxyMTCZ-u{b0Ih5hhd0nwVI^a zHywQevQBWlp6C!J1+SFSSv3gjHtPr&V}jUJJWt!Ut!>+W ze@}|HV$$-X(MVrhT>M`rzFC+-^#p_vLI@$R_yru9Ic&Rb&!GSS002ovPDHLkV1i`U BQ~3Y@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c5d66956051b53183797590cd4630c53c95c4357 GIT binary patch literal 709 zcmV;$0y_PPP)mF04|SY5l_#*d%BM496O$cjRtfZ1#YS(c%y zD%R^YR8?i3=OqRqv9eSuF#yRl0MO}l zV45cO`+edZP9+9lx7$gkX^NE}cv=McLg%`!Vq0DvfpVtWU8`g}MX-aMdIs|5gTG#cT!Pkt`fb#LzTlGFh3Jp!KR zAq+z_8VvxzVzCfyip8QR^SuL#qF_3m0(efRPbQNWQ&hYy|F5DbqR&R75j)o-r4FoI zE{m%lh9MM10dSrTzVvL~vVVZ@H8Kq2V!LaCd5hFLAP54K%Vl_;hr{6z%ex=rlRV}7 z{!QCvc#wSG7kiKXhSUIfo+m|7!~noFO*ETL39@e(L4jVvKIdlSJ+=ph4zf@n^Gf?%Nt z(vu;uLO~WmvM`o~roC*0W|5`Lge3%ZC#1m?ETz95CObPbJ3BkwB!=Sqz{2nM_PyWx z{hQzAeL)ZeK@bE%5ClOG*sRQ|L1WYD^uVzPO|NwghYdR|i!Y}?RjE{prIkAGXs?q> zr2;;2c0k#-J+yyQ2P2F6<_`uMbAEP4t*x!G)3PG}@7e%>D;I}>b(U7(a(Wp(H_RI& z8Nl73IQxEMWKpK$-mWAYyIGl4Z+$f9`4!Ku!`aAX0zEe1wprh8o#Km|O<*DL|A})G zk@odtX~xILv28oBfOb2{Df;~ZOa~r3)%Y+pZZFOk=OWi~p>R6VziR_-n{|Hq{V0F7 z97Z$nWc1z0z&B5SzG(Nq124M%0?DdoE$^Xi2DA@{Hx7`GSIR&e}VmB+k2q676v|E>+NHn#cs&dLyg@vNcR3-t5o?*;&-&t^LA z%`oo;r|HzH0Pdnn!5b5Wp38eN0E?w2tN*^rqksB_MsmO27=i}b(aga<(3+;H`MIx^ zrfGphMix~w##GH1Q{n3!ChTiuQTY+~cTn@**VkIpG_|$0<&D{%ctLmjrqg{z{p3eb zeqV_9e`$D;Q#|Ms7X(2N1VIo4K@bE%5ClOGg#R&#s;%v|zv>z$Y4tWK|5e`Dz~QsthdUApvetp8yN}Z42cdM=b_P0Nlm_A}BsshKcS(#PWzHbnvQHbi7%jJRdy^_Sq z+Stb0*amj%?Z9WBycXFuo$eC%AY8dP?2UOjy&T99?(c=(%7F-WTGnp8{ghXSKXGn? z^Tjz&8vx^&_sV-xb#(H8r%|}s$>;B{A4_+|w?!36>WZ-&aD8E!%*o?qP9FDcwqsPDfxIR>RB1-<_v^qt(yrA}S_?r#?1>TQ^U z?oL3@<+*WnVc_>*=2Au-d0@rng6LCjE>5W%S6wYazx;haf%%`TzyQ@&ynnR?l$xqY zHQwlK`DJ01ioCaM(5e!_F@Vf*=Tj@KW#` Xu*9IQTJkrT00000NkvXXu0mjfNOIbI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac02c47a8444ec2973075d59da903e6dccd962aa GIT binary patch literal 964 zcmV;#13UbQP)Ih($>dO$3>3GQr8vX|rI!VXurj2*RlFFimtvs<1wlwo1uy;q zy_8Uh5Rk=-fk6@)Pie&jiD736p$NNWEomT9IvytPbmzxr-(;ha@O&;i^X~h+&-1+V z&Ro7<5ClOG1VIo4K@fyPF$}{$ZtRn#TUxQY^G=F$x)Tk<@J-X?`juLwz-F__ADulu ze0PFgeZOSkV-)(!^n~| z=@~DvNTz&&>6!V|@kMt7fT_wv;{RT#m~K9@=d@x?(`03(1MNv>hwu4`QM{ix?1@QOC`P72$F75GlJ_jV5N@LO8;KxU=@n@?Y z8DDPc9qH0m9p0-lTlzKZ1E9UO3=7+dQ;|3Uxsnx3j^VZ;Q?BCvQV;Kgl^*~w9GhRs z0b82~yS_Xr5w{LL$N)3RY9&UvB)b+K? z!`xe_hcQ!?2@3Xn&%Cb;QV;}wfoqqC`P5kLc^~NggW(kMm0YKCq+LTGur?k))mm4p zGNl>DrRBI^Anp^0`UAA;NkuiEDObq=lQ$nQx;sy%Tn+PO%2gKKjU(sjy8+5%VAl%F z&PEku&+~>x4>qTlPvEHjfVBK}t-$9ci^-dT6hFG_QOUttEZ^OwJ*Fx!{>~fW*them zhpw-EHUqOkQeTGyB{{_>Px$=_9-gWI0000yifAJdEW&3JOCkt z5JCtcgb;6r;|Vq#Pq3rDjz)w;8*05V1^|`aG6n{R(AL%t0C@NQt#HhvaJ*eC3kthRzaO-|dMNt6& zbMv#l55O^zMwv_+#X8Bp2XAJib0n9vN+SC>PEVZbm9oEsg5VHilIQaBL~*Bq-Ts@Varc-zjd zZajJVOen@-8XD2zc!J4tJ9Iq@P3wcMXOUlDv&H0h)63oCZ8$y?n&u%`kMnIH`gX7` z16h`!sy%_cVgq?+Tkl{H>y{8g2qA9I&`sFjit&(tNN9&C-XB~p|98Fh~z!M|r>yrZau!Jf43J ziycU6th1}z+~3~bvHjnfJ3NeX`i!j;9UUjl?Vmrs1E|eD@xcOsd_HIX-E9UoTp{AL zxA(`^=^Hn%Ly{!4w6x$A)HV-*oXvE7tPWlT*yF!%Yh!i}#>AgD?)FX!YBVO8xxF8A%g2PM~B?@vL|NR)+Jr9f+m g2qA@R`x39V2vQ}eZBxe5ClOG z1VIo4Q9HdoeXO^qkDYcN_0r%Zcz9@p0l>k*K9&|2;5+9B0HoKJ9qD)p$BBp9LoB9gnP2uCbyD5YZJd=*PqP3Y`mqS%dedKIGB4Mo|<_aEOpQ#^3gz5LE|tUACl zdH%Gw+V?8MLnBO<*P$qC)%FLf{0#C=s3t-X1VIo4K@bE%5ClOG1VIr0F>d$xYw_Pl&NN<1eciK0x8`$wbOF zzLsn9F?Xr9+t^Nr0hk7i(=$`1c%D>8IHDih+xunG%4}{px?@6Tm#NU!))swxXM4-_ z36-rsAd`{xc{>11&rF$OMn~^rV&aXd==%@u!SDC${sE`Hf${Oz__?=>LZJXvRq^u0 zEB&*>!#|F+YQeSxN++y9`Hb-PtvhUT@@Qe2d_Gfry&dp7pVzks22yzU{;jJWVCfHN zZY~-OI>Hfs=3a@}xp_#EqcLxzVt)nr4->-Nx1*02DhQ8odBnUN3tHorY(??Q1#`GWu`wIh8yE h1VIo4K@k5ke*r}ZPK0JfxVQiS002ovPDHLkV1ko@e7^ty literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json index 27d7ebd665..3add3a471b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json @@ -17,7 +17,7 @@ "name": "equipped-BACKPACK", "directions": 4 }, - { + { "name": "equipped-SUITSTORAGE", "directions": 4 } diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..6c1d1581e8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..27c2e923590ea7bd6ca578a243d6be463f2ece3d GIT binary patch literal 836 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVCMF8aSW-L^Y-q>tlJJU$3M73oO8@D78x$U@dIc4h-qnknSv05E{8>rX);o;(_e;J${k>=_ z=ZBxp;q`jrr|r!3lYQd6Z@&Mn`YuCZ{$JDW*OuySoy!nZO=)m*5^N~$J$(q+P%@>*{&J##`pIAd1&HWyZ?TCb-vkb&q-a2 zE}T5ssq*sCBd3q4dMod?PQNb6*Df7jXL=13DHByPZRF(3m^`jeJ>o3*!e2f1?~kn$ zRQA?izdHT>(^9j*=Wmj)*ZuZnSJid_qr4P zc9X{9M!q!lH?vqCmRL;LvEAs{k5cZ5XraSW-L^Y-rktlI%1$3M*!PegxlEbYIrHF>^b^zJ8&F3X(^XF2KeDsr-^KSD?LPM-E~Iqf4qa`}W4$Xsacf%66^qz@d#XzB z@#NIVWq!+*J+rn(asNM7U~%Wh!S`RQzU}+leXMe>`s`(yi}$O~j=ytmWr_9r{?MDP zkG8!zSQniBeDdtv`IB#7H$N8P`RdQvyHyIMaiZVY^*rPYii-Z$rcQbO(~a+s&M^t; z{bx!m_SDop-j=gRJ9WCAxt;i=FICG|=G&`J6>~^6Zs1(9`SVHNsnbq=-ZRnr)%%^2 z%Dd;h`+PdS-k;gz*bOV*eNU2ndNu~_`?B+TbN1uAufI-ywsYeg;XhDT?A9_+oniGSw0Kk=@y?EAIM z-v=(gELkk-x}oTp#B27_dxoF;R%&$Ex*zxJ$^lK3ec7o-zJ%7KQ zlWd4I+o-n!Ru kb?++jJ~E+)OT*Ql>?aPW+>K{4KLL{SboFyt=akR{00j4gBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json index f3a7f48582..42b8d94d6d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json @@ -17,7 +17,7 @@ "name": "equipped-BACKPACK", "directions": 4 }, - { + { "name": "equipped-SUITSTORAGE", "directions": 4 } diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..6c1d1581e8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5f5b50d715d73bd3b775659d70f0aa8e6752b7ed GIT binary patch literal 775 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU^?gN;uumf=k49SevchQ+8*k! zUh^bv0^jbala85eom>|SwC}KoI~;vmApGS*VBikNE^d_=AFlFyNs{RwHl5-x^O*KM zbB_G^7jr&-v{>240yG#K*f+)I{A?g9Jzn`<+BmxUPWYymxAcr(Wh=e^+upo-l~-u! zSFy`>pYEBv2KHR~ez*A2d;6?A*Im+<9X{;rdFk-s<~hYh=QLX`$T@RZSz2Dae0j2- zo?b~w$&%(~=Ggf7Y^%9hR&!r{`}XbZp1Z5`PZyXr%FCxumoCqUfBrsu(ISlykyaJW(?+cVDlgYRuCbdw^X0Q=%Ve|DW}Scj{+#tp zpIg^A-(0i4fPM0@->W+3Pfy+Xt)}qqyLa#Gq;Bo5(rzeuZMIqMw2`fyU7yO<&e@T| z-AjzaF3msmvWr{6vo!X*=sSg1yXu73Z_(&@_x$xa>nn>lZfElNt9>KYb4Fxxny=0I zGqZLSoZETtv5Z%brEZ6BclitVdwzEQkL{aQt#W(0zq$5DO<_^0m&^O8?~F$9&{^Hm$k*{JZEgm2+z@e>5!5wEoF|$FMg{vd$@?2>^5)XFC7@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4810c9c3755d51feca9b5af223da74e164fe3016 GIT binary patch literal 762 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU^?jO;uumf=k48%evcglj(yZ$ zK4;3YqY8mKLcSS+QgS`&9!Fn)&{(o~Q9<(uuj8`UQZ={T)=ubse7cac(5dMAf75M` zkIb7n_r_BXpqW^KY}&MAj|-!|m!I4DWKQ(&^4%pIhGo2EmBz;2Y1=-Qp4xOL^Umss zYggV{9DiJR>-diL+PF2h|K9uE+M+(WQ|0Bqe{q*zhJ5}R!_UvZYu~F_wHSY zNNd-k0FH$>+XPDL>hwITs;XWYKe;z!W?x^Qis$z2+qJrq9{yR?{eF)3&b-s})b7s8 zTXmgn!jj38C#T)7-e2(U=g-JX-W%7gTQ}?c*)^8pP7%BI?%es(`byl?)RmibR6Q48 zT+vw_yZ)>9+P`k0q0&cp_^js@NUkyexN4P1@}IY#cdfhqyZMgAy=u$nK|O(`vG4Cb z-n>?J{>-HpGrlZ*-6Aln_5HP?$hT%!e+xTQao;%;q}MaEHbe1u-IKS6)Xx6;@#Dr7 z{bMWcc-#&5im%dNH`Da}+Fk3|e^%W8fAIH`*v)yi_WD{_gA=QujGVFe>0|5D&+Xij zGwIvHU(x$6y({|nC2&dFv@i2XiHnO@25eF} zc_t)uDkK7)U3}SY=CE__{~R;vHM8HpF5f=wbJ(%t<$JFm{XGBtuYZrDi|24p<}O&l zJ)ieWsp9{dxk+`&GwCM51Xn&BTr>mdKI;Vst0KA)NqW}N^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..6c1d1581e8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..26a569bfc22539776d31f5fe329577cb1f3a891d GIT binary patch literal 867 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVAk?ecx%m-Bt)_C06jkUZ}I>bvaM( zg;kZZ>#jSj3|XahFleQUXI6gxbQRt?*2^A0oE){4t7`X_bqgc%pW4jzJH0K}^U|F= zF$>}hw@wOvouBpV?vW!cug@+_uc_ISR~)jP$-p{Eey*T%4%jF>L{c3s?p4-?JK+U{Kar ze*SzmjsN16XQ$nEYTf&Bm7USEYOiWxW_i>mBpWP+ZV3&U3_tcwULpMr`A-jNlUV)pUb+c_2TWN zU2REwr+zN6(!IUysp-Uf>w{KK(SAF>Mmmn+@87>gbL8)C-kY5DW>(nRCY6^TyUUGu zoVVp_i*RYyX|3OQ#dxibeu$L*d-cPI55L?0+f%=vwC3+Be7|y*CFj{~w$JTF547KO|Mg?%N8Zh~`SSBmKh@%FJDhku`Var+ z{y#jc7uKD>sm+xC@%i%QC68V#Tz2G9HDk{AVx<_*Uz-BIS`Td;~&qn zq<2T|Op={2$CV?Tb)84~joyEZ(Ge?J!!x#SFl%pHJL!;~3#Sa*wn-K&ANeeIPHB2w zqLj&GwM2k3@`S8nF|*-GfwG9_T^pEZd)#^PrvJ!y?rA@bc&zU~|7mxB=1VzFpw(Ex zge6HEXMCyVQ+HhdxnxW5?&kBaXMVSn{V$&L;_B}H zNlV-oD|()KT9o@gbY)0S+}Yj1moHz=<-VR_Vq$4o`KI#UkB_NklV3SJV+|Bm(DCTywuTJ<+Xr|#OHuMyMp|4e)L@7AH5>+h!i)J`bgy)xnX<%OT8 zufLzX(fY!v%b#C=zr_1xXHA;wWp#(Ew@rasq@#U3f4wnhu)2Qg{;{y&e^qy;=3@mG3WqoGiXiMRWRT&q-QSz3xB% zquVF_{?DI1VPRpr#EShVMZ!Z^{*`*p?Xn;ZkuBS|s~;~c`F+dP^OEK7JzB>8pm1Gw zeDaOFecwv7Bqe39`#cT5`fuj~1D@2#F!zsoy1J!X8I0b`)die9sh)iJ*~IHxgdXi$ z_i$I<_T^WCRn_O)eS5pvnd@-CBoWt%Hs@bgJEq^V{iCt9HFE7*z2&+Wm;Svg&(bK! z(iph@y8oSX@2=e5Uw{49t4(=+cGFaNgU;A$Hk^ICtZA-)`#E;U3*TA39C}t}EXyBt zCRV>;)%NTkuQ!@)`!>1YgY<(ftE+aqt^Top`wd3)&~hmM%g+$5qgkx;PXi?9>FVdQ I&MBb@0N<6AR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json deleted file mode 100644 index fefe1f6eb7..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy", - "size": { - "x": 64, - "y": 64 - }, - "states": [ - { - "name": "pump-inhand-left", - "directions": 4 - }, - { - "name": "pump-inhand-right", - "directions": 4 - }, - { - "name": "enforcer-inhand-left", - "directions": 4 - }, - { - "name": "enforcer-inhand-right", - "directions": 4 - }, - { - "name": "db-inhand-left", - "directions": 4 - }, - { - "name": "db-inhand-right", - "directions": 4 - }, - { - "name": "sawn-inhand-left", - "directions": 4 - }, - { - "name": "sawn-inhand-right", - "directions": 4 - }, - { - "name": "improvised-inhand-left", - "directions": 4 - }, - { - "name": "improvised-inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index 27d7ebd665..3add3a471b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -17,7 +17,7 @@ "name": "equipped-BACKPACK", "directions": 4 }, - { + { "name": "equipped-SUITSTORAGE", "directions": 4 } diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json new file mode 100644 index 0000000000..6c1d1581e8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..09fbaae551e31935b23ac2efeffcaadcd8f99f41 GIT binary patch literal 905 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU=HwfaSW-L^Y-q>{M&9K$3M<* z(3?1oImAN1q@{U@%AH+C9105rSPFbLrL3Cpg#U#7M4#M=y4hB#IbnyLdzkiZm40g= zIpgGtL}v3F*D7RX45wVawaGiMQ9^Cu>sd%S02h;r2$i+YE z%HGVGT)gheotp4xDd*?e1#a5A_`|!o#mCidTW`9i)ur^e;(uISo$lSs*ZvjGJiV%Q zU#6bO^~LS{Uq0*aKeu=Kl;>N2L`r(CX9yJWoOJDy@6E;1T~U|+l;#`Ekt6|L#pjnl&b&81_T#eSzK+8+ z{C{SoJwLb6YjWJ>@9YQ7pV$BXyxu!}o#*$RU>wi65 zX1DC-op0gKO{ec-osxMWv%30A>iPFu_FnP{`n$d1X8-*4(pX{zyHLVSU|byydvV=S zfW@xwan$iWU#2ZPCJ}G(?|NaPgqG)|{9Wzwp~ocld+fP;*eCk;>gU8SUo0pSYAH{lq-?FuSPnW9KsvS%&flIcQ80W9q zV=mz}Y0cKk(i5B37-mc9uDsSe{d`i-$L?d%d)B?WF+GlPPI2$ed%%cVeLVTAeSN_9 zYq_@dzxP?_*~|4EyL4<w{Xh^m_(ny&un?DEGu-FkRN_Ovpe2UHwd)csUH%Xj~_#Qkbr=H8(j!#}w{a9z5a uowxMX)_>nu<}~}=zP{M&94#~xmH z6+g-7_R-)L6Yp(j-tM2ka&ObF;Az`#a&bs4QjOVd zX!y8Mj%BeUPr*dnxb}t?Rm%-?f~GwEGtYII&*b~3t?Qn@RRLOv4Rj^;Y;+X3;dioXj>o zcH{E#`IlFo-uE-&-j15+YrV7lLbKN`m*4mL$^F(ujr-r9ZjFBaulCEgxqHgI{pZ`x zPoMe!^x}BAXQf_JtH1s`Z+|wV`tr(GXOBPLdDUX&g_+OHvce|)xhm{=>D|ANH@>Pz zC(l~;skZ)&)a#E94_7GFe^vSa=Ruy=FOx*QYW5SK)*NqM`DgQu+CPhBzf|A4YadrA zZ93cbbV0~Om80$Mt>(+OMR*SSv+Nl0 z`ua9}X4?qlPnLb)eQ$~D>%5S+)33cX%ldZk?d#zC`}-#!n(z8h_5qMrC9m#nTQS}7 zn(yZ4H%fZz{y)Ee$lBrIf0ndnd3m|DD*`v?El%pz`;}ez%TmivB~&a{2wVJM72BcJ zq_APKv|oJbF$rlF$IO}HyB4P}*R$S}_M~#&B8^{fDl=#49X)n&v%#?&k)P)Ms$92| z`@YpTC2$0(ufH24(e|k}K5n;ZnIAlM;sd50eR(DI`ktGg{(XENpDdgh=T*7-j@wx; zt77AqYmP3@)Vlv&)${d7h5IHyn|H4?;F-RS*(YtjX@1(ho!+w<{=Mondw(bN`_a`a zb)TxAzkl=Ir4I@I=6UxnO`g7fdfA7iFW+o_QYzymgS;Bb|zKoX=n7^_ykw zIt~#E-c@$_pzFQIjkL;D&d~J`0Fg)(IPbG*!-0W_0(f})9&39RDi}g5+f5s*V2HTC z0zlR*)vmjnoFB_5fEDwYjZ+`r@@t-l7)lr_?yvAz?``^S#XRO?E`O;3tp3~wV0*jR zwBA2AJEH)S!y^E!fBpo(+gHn&`?iKvaf=(=E3 zk13$m?6{F`c=ob~PRoNt^_Y5eC(v+hZO>xeDrr$YrY<{#XHTEh`WPI1z{29vwLGSt z#*MT}hWk}@KwhGHOeMqp$~`zCgb+dqA%qY@2qAG6H{-52&vh_gCmmB>0-!sJ(`-e%`ZwTuD7>F#u?v6}TuPV3!ZH`LT@ZBoEN4 zX5i$s<9hY$>uUpT>-*goF3JmdW(EFa1dRJ(Mk9JHA5eY2-!2c}uG>`8-MlN4&?=AM zI7b8meQoP{PNzOE&`nlgC}F6SuLo$K2e_yvK%ubNam}HGp{oCK{cH8?p+g|h*Y*y$ wmY_hjk!}ZYRkgE+4nRi(5JCtcg!pg$0+0`Gx^L)z;s5{u07*qoM6N<$g32XIWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7a478a39768ae7fcbfcd6608a815878359811004 GIT binary patch literal 733 zcmV<30wVp1P)yw0fS0hs0-u97eE(4 zLQ9)8&_GE_#i|V~iq{2BooT0Z3etr+zuolSx#!H>wwwEb5JCtcgb+dqA%yt%o<5mX zS2_POv`!}5jTsT0l@~9Wn;c=Ye}t`cp0VJmYi?g6!B#p?D$qmv^cSY70}zeI0C@F! zRcl=L;9wtsVzEpr(8IgTR!98-=%GPXu6*--pKIcH!ct?wQ|_6406hP+=^EEVgY})6 zG9v)wYXP)MxoKe)($OkqtgykCpGN@f?H#mjYk_zGtXuLNZz@t0Jb;Q z0a#pG))waH)Soe&V{cYg+dZqNkLjGYS&6ILq28vkYW2A3GgtF5Gp?ov`dt(3U5J@+ z1+ZV-?RZxnJ$z9A=8TTsVsUA?X^n;XIaMg^)UV&Z|Il$AyU+dNu9h?+$_g8eL~4waTn;!pI=8R$wE(866OG1P*?`N`^U5c9e>&u=av*lNJ(yxf4D8EBaoC>>(n)YZ)FV><(&wl~&2 zkI4Phu4fb!WWJU>>%re#g0m*jRM*!F0JyHM0cS_ec4lBaVX15`qh;INTRbXjg~Cq# zH|h7`8*BTm=d4*M?6k}zfX|AD`CN25`s(`g!u#qj3M8xjOTc+a-&54Z3Wv$V)VH^2KH04M<3 z@Aql5*@R_T2!epJ_K#@eCq-KH!9Ta3;Fq6%n0l{TtuAcP=Z5g^44mw?x~}7!Yv1DN zp93rr0`K1g3T#bTt>>6|Few8m{XjXkGf+FT`Y?wU@gPuvso`8;+W zZI8J4`uaL7%R(-fgJoIhbUG9O5{U#kIy#yf4*7hZ*tQK_*OAZX(P%U#`fY4%5ZktK z`}XayZF6(;y(Y-U=1Hg1Xt&$E4v|dLM7>@og+hT=DwPvsx6x>zTrN+vXEGT8fN7d2 z6bg9o-~j;8qobp+|D8K`_;bn(&0K&&p#W7?spom5Ua#Zg#fvz5_AJ#j z4YgVg*=!b?rh(0OYio;0wOS1rhJmJOq}%Nxl}e#jt5IgWrfC@72LME)QL?wUhu5!P zQ+~o1E?fxDd%Yf!Wf_r3BpfT3%S|=>?c28_*KFZbRYj>(!poO05s5@dG#Z^bdDb5Q z86E)~|0s^*AeBmyUa!Y&3B5uB_buSME+0Dt0CgOPWV2ZSfaiIzEQ=P4McQaINIIP+ z)oOJjY*trS$@20t9zJ}CYuB!YV-0UJz47Np+TXoaN_KB$$L={ z1Y|H6U~g{^k|a?8h{xk#@jpJvc}$zbIH&#+e4jzNKGe2tqU$w4(!%o9%gKG$^} zvMi(9?NR_xRh881^^a|;Kp+qZ1OkCTAP@)y0)apv_`+EDPf_;Iuc9b8ckUeRbUJ9a z+oa#`1Nbzx0ZemNO~N9Y3)Kez|JMivK|n3bLbKUKzu*5HwESux7+1YOQCy}N+o!nhqcRJLy8c*ZSIZK z2B@k^JkOgDn&+N;vPG6<$g&JYQ2>l)f^=OEGrmmEFbrgJUy-O1$IheeiLqr_h9pUt zl~WiG0SbUBib978iO{8WU5Bpg*x%oWs;czwr+?9>)g8(bp6uv(9$j5s1@|nybm`LE zB8auMwXlD;+oi+w8QtIC4|R22M>?Gj)7`x8)9Mc0d9+OviNuI58&6f$nPEAx2RM#{ zQmKS&Hp{22!vXvKK6M-i08lQMarNp|l*?sgG8ver3Bxcj7z`-O@t4bGym;|q?!K_J zv;@;MLrs>^<@OW`fVSIhYMLfY(?lkd8PPWk1DQ;QGEM%-?48DV2vEKjK+`n1t{c_| zupB$P9mf)1aO>Z&t|isxTb03{Q2`}wOV2E10$Eq zk!G_=4Z{EcxUS3B225p`W+%Y$rWFJM6h(pW`$#5}gx6pm!QM8PFJC6fWD;l2oWZka z&yY%`pePC%?qfuj<+jY@ASj6t` zZdmj%W(!TFQeoRQu{2wAr|MBC;Q^))i3lQ?TN@e+l$AX?F5C{YUfk5!Z@gMSibKRVz=4k)` N002ovPDHLkV1kanJ;(q6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..03625930c8240af892deae0025cd9448e768d645 GIT binary patch literal 1665 zcmV-{27dX8P)Ht_7{;GVY*Qjthmb|tfum3X5(JQtQ3&e69XfK3$0AFI1YOmke?W(NEi!aU#|G%A zB|ru*b_r)FP)J773=|Bb)+v%{!~9Sr=Q>z-AR|$>V>>C(`vC&U6Uq1EK1lF=0Et8* zkw_#GiR6C?In7C?X^Q<+DusoG1r`JWy4^16_xs|%X0v(m9$qq6&TuXRz``(Oj^m)! zYN6lnGv2=P&9|51;UzP5mXq(_zdyG9`yYSCZ@>O>Ar5_N2oN9QNu<+h1VO-x#UdQX zL9tlG)YKHwzR>ZWF=Vdk*jRgU;xstP)+2)7xS!2t6H@@#_VzZa)hYmBb#*nipUdS~E|2|xYEDMcBgOo}o20-lBYPHz)nx>KA7M|xZew>8w`%qPt`Mys8U}k0} zDK2h@5Ysf7Wm#iySg+Rs9QQiMwr%9|d2xK})~%6t!!S^<*C!tPzE4zDWkbh_s;aEr zZi7;aa=DClyN&(*ee(MCYm`bQXqv`6&m+7O#_{msL-@YWR8=KUpFYK-M~^@V8QUqf zS`E!+lS~1?+qZ9Hf3{jJ0D!8hyl*ZKcY6a~QX2mnBa+eCJDcF^zl$$=hTJa#C%t{e4*^?E%3z~<)W#K5E1tE$SbTseNacRC$1Jv~jXUcD+}`XI(w z0vG^HuF{`^d-v{%Kq;lrG>tSG z4XmuJh;urf4uT-S`uciumLoxl;q$qJI}N2$37+TiHH7qfz0ck$5{X12kw_#Gi9{li zNF)-82w;qySpR|!*kg@i#|Xw)B+@F1uhfT z@Ap}&)q>+V2*dE)+JrOd1ET!?ViQ08@LjCUw(XC0i1Mu=x zlrO*f8vW46+txpfYXuy~fu?E1^Ssz_tW+uhfG`Zv>-A#yn>1|4)%JOnII2;|&0i;j zBZj}X{(`1yqKp>3UQrY%ih@)s1t4B(OPm6lrmJvX-{x{TRxB1#tyZzTyo_qKid-%S%d%iu78gH=U%%gH zlu}SiVObXP`8+Jk0xw`D@#@tp7PUPX3|O&Pgk@RC<#I9m+~25Xi3iGURw@+{QCsxw$Fgp125d-9VCFAi5y&WEh44!!Sg`48tJpcAG^LNGTQPoW=e)krof0 z>k*=rYDy`K_IgyxTu~GZ z%j0KHfTAc&(=;AD13+xsj)@&~U58;9tX{7}RaN5qJ^$ zySuv^^F>h2xqRH-}6n!_^xEL(PC`nj*MzxeQ7v;q&bx z-UOreBWhHJgfjid+C0;%a6~kLBu6fT58nx7y