diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 10cc39d17ae..0d4bffdea03 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -722,3 +722,42 @@ - Impassable - HighImpassable - type: GrapplingProjectile + +- type: entity + name: plasma + id: BulletPlasma + parent: BaseBullet + noSpawn: true + components: + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: declone + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffect + damage: + types: + Heat: 12 + Radiation: 10 + soundHit: + path: "/Audio/Weapons/Guns/Hits/energy_meat1.ogg" + soundForce: true diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml new file mode 100644 index 00000000000..b6ecac1944f --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml @@ -0,0 +1,107 @@ +- type: entity + name: microfusion cell + description: A small energy container the size of a palm, commonly used has ammo for any kind of laser weapon. + id: N14BasePowerCell + abstract: true + parent: BaseItem + components: + - type: Battery + pricePerJoule: 0.15 + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Tag + tags: + - N14PowerCellHigh + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Appearance + - type: PowerCellVisuals + - type: Riggable + - type: HitscanBatteryAmmoProvider + proto: RedLightLaser + fireCost: 50 + +- type: entity + name: microfusion cell + description: A small energy container the size of a palm, commonly used has ammo for any kind of laser weapon. + id: N14PowerCellHigh + suffix: Full + parent: N14BasePowerCell + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: icon + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + +- type: entity + name: plasma cartridge + description: A small green glowing cartridge, commonly used has ammo for any kind of plasma weapon. + id: N14BasePlasmaCell + abstract: true + parent: BaseItem + components: + - type: Battery + pricePerJoule: 0.15 + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi + - type: Tag + tags: + - N14PlasmaCartridge + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Appearance + - type: PowerCellVisuals + - type: Riggable + - type: ProjectileBatteryAmmoProvider + proto: BulletPlasma + fireCost: 50 + +- type: entity + name: plasma cartridge + description: A small green glowing cartridge, commonly used has ammo for any kind of plasma weapon. + id: N14PlasmaCartridge + suffix: Full + parent: N14BasePlasmaCell + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: icon + - type: Battery + maxCharge: 500 + startingCharge: 500 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml index 1a2e8926166..53b36b3f955 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml @@ -81,3 +81,47 @@ components: - type: BallisticAmmoProvider proto: N14CartridgePistol12.7 + +- type: entity + id: N14BaseTopMag12.7SubMachineGun + name: SMG top magazine (12.7mm) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - N14MagazineSMG12mm + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol12.7 + capacity: 40 + - type: Item + size: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14TopMagazineSMG12mm + name: top mounted SMG magazine (12.7mm) + parent: N14BaseTopMag12.7SubMachineGun + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol12.7 + + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 9441f730fc9..1a2c296ccea 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -1,6 +1,78 @@ +- type: entity + id: BaseWeaponPowerCell + parent: BaseItem + abstract: true + components: + - type: Sprite + - type: Item + size: 40 + - type: AmmoCounter + - type: Wieldable + - type: GunWieldBonus + minAngle: -34 + maxAngle: -63 + - type: Gun + minAngle: 35 + maxAngle: 65 + angleIncrease: 4 + angleDecay: 16 + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + - type: MagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PowerCellHigh + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PowerCellHigh + - PowerCell + - type: Appearance + - type: StaticPrice + price: 500 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + +- type: entity + id: BaseWeaponPowerCellSmall + parent: BaseWeaponPowerCell + abstract: true + components: + - type: Item + size: 10 + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/taser.rsi + quickEquip: false + slots: + - Belt + - type: Gun + minAngle: 10 + maxAngle: 20 + +- type: entity + id: BaseWeaponPowerCellMedium + parent: BaseWeaponPowerCell + abstract: true + components: + - type: Item + size: 60 + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/taser.rsi + quickEquip: false + slots: + - Belt + - type: entity name: laser pistol - parent: BaseWeaponBattery + parent: BaseWeaponPowerCellSmall id: N14WeaponLaserPistol description: A highly advanced laser pistol. components: @@ -14,20 +86,26 @@ shader: unshaded - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi - - type: Gun - selectedMode: SemiAuto - availableModes: - - SemiAuto - - type: HitscanBatteryAmmoProvider - proto: RedLaser - fireCost: 122.5 - - type: Item - size: 10 - + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PowerCellHigh + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PowerCellHigh + - type: Gun + fireRate: 3 - type: entity name: plasma pistol - parent: BaseWeaponBattery + parent: BaseWeaponPowerCellSmall id: N14WeaponPlasmaPistol description: A highly advanced plasma pistol. components: @@ -41,19 +119,27 @@ shader: unshaded - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PlasmaCartridge + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PlasmaCartridge + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true - type: Gun - selectedMode: SemiAuto - availableModes: - - SemiAuto - - type: HitscanBatteryAmmoProvider - proto: Pulse - fireCost: 122.5 - - type: Item - size: 10 + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg - type: entity name: laser rifle - parent: BaseWeaponBattery + parent: BaseWeaponPowerCellMedium id: N14WeaponLaserRifle description: A highly advanced laser rifle. components: @@ -67,17 +153,26 @@ shader: unshaded - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi - - type: Gun - selectedMode: SemiAuto - availableModes: - - SemiAuto - - type: HitscanBatteryAmmoProvider - proto: RedLaser - fireCost: 62.5 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PowerCellHigh + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PowerCellHigh + - type: Gun + fireRate: 3 - type: entity name: plasma rifle - parent: BaseWeaponBattery + parent: BaseWeaponPowerCellMedium id: N14WeaponPlasmaRifle description: A highly advanced plasma rifle. components: @@ -91,10 +186,90 @@ shader: unshaded - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PlasmaCartridge + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PlasmaCartridge + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true - type: Gun - selectedMode: SemiAuto - availableModes: - - SemiAuto - - type: HitscanBatteryAmmoProvider - proto: Pulse - fireCost: 62.5 + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg + + +- type: entity + name: urban plasma rifle + parent: BaseWeaponPowerCellMedium + id: N14WeaponUrbanPlasmaRifle + description: A mass produced pre war plasma rifle designed for close quarters combat in urban environments. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PlasmaCartridge + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PlasmaCartridge + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Gun + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg + +- type: entity + name: multiplas + parent: BaseWeaponPowerCellMedium + id: N14WeaponMultiplas + description: A modified urban plasma rifle, it spreads the plasma into multiple projectiles but sacrifices accuracy. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14PlasmaCartridge + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - N14PlasmaCartridge + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Gun + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index fff1abf14db..8736feb7842 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -1,6 +1,67 @@ +- type: entity + name: N14BasePistol + parent: BaseItem + id: N14BaseWeaponPistol + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + size: 10 + - type: Clothing + sprite: Objects/Weapons/Guns/Pistols/viper.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 6 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: entity name: 9mm Pistol - parent: BaseWeaponPistol + parent: N14BaseWeaponPistol id: N14WeaponPistol9mm description: A cheap, ubiquitous sidearm, chambered in 9 mm. components: @@ -35,7 +96,7 @@ - type: entity name: 10mm Pistol - parent: BaseWeaponPistol + parent: N14BaseWeaponPistol id: N14WeaponPistol10mm description: A cheap, ubiquitous sidearm, chambered in 10mm. # TODO: Need to create projectiles, magazines and boxes for 10mm. components: @@ -70,7 +131,7 @@ - type: entity name: .45 handgun - parent: BaseWeaponPistol + parent: N14BaseWeaponPistol id: N14WeaponPistolColt description: A rugged handgun chambered in .45. components: @@ -112,7 +173,7 @@ - type: entity name: 12.7mm handgun - parent: BaseWeaponPistol + parent: N14BaseWeaponPistol id: N14WeaponPistol12mm description: A rugged, robust handgun chambered in 12.7mm. # TODO: Need to create projectiles, magazines and boxes for 12mm. components: @@ -154,7 +215,7 @@ - type: entity name: 10mm pipe pistol - parent: BaseWeaponPistol + parent: N14BaseWeaponPistol id: N14WeaponPipe10mm description: a light 10mm makeshift pistol, the grip is incredibly uncomfortable. components: @@ -186,3 +247,124 @@ whitelist: tags: - N14CartridgePistol10 + +- type: entity + name: chinese pistol + parent: BaseWeaponSniper + id: N14WeaponPistolChinese + description: A elegant and long barrel pistol with a integrated magazine, chambered in 9 mm. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi + size: 10 + - type: Clothing + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + selectedMode: Semiauto + availableModes: + - Semiauto + - type: ItemSlots + slots: + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol9 + priority: 1 + whitelist: + tags: + - N14CartridgePistol9 + - type: BallisticAmmoProvider + capacity: 14 + proto: N14CartridgePistol9 + whitelist: + tags: + - N14CartridgePistol9 + +- type: entity + name: the spy + parent: BaseWeaponSniper + id: N14WeaponPistolSpy + description: A modified version of the common chinese pistols. with a integrated silencer, extended mag and fully automatic conversion this gun was designed with passion, chambered in 9 mm. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi + size: 10 + - type: Clothing + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/silenced.ogg + params: + volume: -10 + selectedMode: Fullauto + availableModes: + - Fullauto + - type: ItemSlots + slots: + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol9 + priority: 1 + whitelist: + tags: + - N14CartridgePistol9 + - type: BallisticAmmoProvider + capacity: 24 + proto: N14CartridgePistol9 + whitelist: + tags: + - N14CartridgePistol9 + +- type: entity + name: 22lr Pistol + parent: N14BaseWeaponPistol + id: N14WeaponPistol22lr + description: A simple and silenced pistol, chambered in 22lr. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi + - type: Gun + fireRate: 8 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/silenced.ogg + params: + volume: -12 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazinePistol22lr + whitelist: + tags: + - N14MagazinePistol22lr + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol22 + priority: 1 + whitelist: + tags: + - N14CartridgePistol22 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 904cfc9f73c..adcd7dc6386 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -13,7 +13,15 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -21 + maxAngle: -38 - type: Gun + minAngle: 24 + maxAngle: 45 + angleIncrease: 4 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots @@ -45,7 +53,7 @@ - type: Appearance - type: entity - name: Chinese Assault Rifle + name: chinese assault rifle parent: BaseWeaponRifle id: N14WeaponChineseRifle description: A old foreing assault rifle with strange simbols on it, the chamber has enough space to hold a 7,62 bullet. @@ -59,7 +67,15 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -21 + maxAngle: -38 - type: Gun + minAngle: 24 + maxAngle: 45 + angleIncrease: 4 + angleDecay: 16 fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg @@ -88,7 +104,7 @@ - type: Appearance - type: entity - name: Assault Carbine + name: assault carbine parent: BaseWeaponRifle id: N14WeaponCarbine description: A black compact assault rifle, uses 5.56 ammo. @@ -102,7 +118,15 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -20 + maxAngle: -41 - type: Gun + minAngle: 24 + maxAngle: 45 + angleIncrease: 4 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg selectedMode: FullAuto @@ -135,7 +159,7 @@ - type: Appearance - type: entity - name: Marksman Carbine + name: marksman carbine parent: BaseWeaponRifle id: N14WeaponMarksman description: A heavy semiautomatic rifle with a scope, uses 7.62 ammo. @@ -148,7 +172,15 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -44 - type: Gun + minAngle: 24 + maxAngle: 45 + angleIncrease: 4 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg fireRate: 5 @@ -180,7 +212,7 @@ - type: Appearance - type: entity - name: Service Rifle + name: service rifle parent: BaseWeaponRifle id: N14WeaponService description: A cheap mass produced post war rifle made by the NCR, chambered in 5.56. @@ -194,7 +226,15 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -21 + maxAngle: -43 - type: Gun + minAngle: 24 + maxAngle: 45 + angleIncrease: 4 + angleDecay: 16 fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 05d1e75a745..9371c0a84d6 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -17,6 +17,17 @@ fireRate: 10 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + selectedMode: Fullauto + availableModes: + - Fullauto + minAngle: 8 + maxAngle: 16 + angleIncrease: 4 + angleDecay: 16 + - type: Wieldable + - type: GunWieldBonus + minAngle: -7 + maxAngle: -15 - type: ItemSlots slots: gun_magazine: @@ -39,7 +50,7 @@ - type: Appearance - type: entity - name: 12mm SMG + name: 12.7mm SMG parent: BaseWeaponSubMachineGun id: N14WeaponSubMachineGun12mm description: A heavy submachinegun chambered in 12mm. # TODO: Need to create projectiles, magazines and boxes for 12mm. @@ -55,11 +66,19 @@ sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi - type: Gun fireRate: 6 - selectedMode: FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + selectedMode: FullAuto availableModes: - FullAuto + minAngle: 12 + maxAngle: 24 + angleIncrease: 4 + angleDecay: 16 + - type: Wieldable + - type: GunWieldBonus + minAngle: -11 + maxAngle: -23 - type: ItemSlots slots: gun_magazine: @@ -78,10 +97,6 @@ whitelist: tags: - N14CartridgePistol12.7 - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 @@ -89,7 +104,7 @@ - type: Appearance - type: entity - name: 12mm AutoPipe + name: 12.7mm autopipe parent: BaseWeaponSubMachineGun id: N14weapon12mmpipe description: a makeshift 12mm SMG, looks like is gonna explode the second it shoots. @@ -107,6 +122,17 @@ fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg + selectedMode: Fullauto + availableModes: + - Fullauto + minAngle: 8 + maxAngle: 16 + angleIncrease: 4 + angleDecay: 16 + - type: Wieldable + - type: GunWieldBonus + minAngle: -7 + maxAngle: -15 - type: ItemSlots slots: gun_magazine: @@ -132,7 +158,7 @@ - type: Appearance - type: entity - name: 10mm AutoPipe + name: 10mm autopipe parent: BaseWeaponSubMachineGun id: N14weapon10mmpipe description: a makeshift 10mm SMG, if you shake it you could hear the loose parts inside of the gun. @@ -150,6 +176,17 @@ fireRate: 8 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + selectedMode: Fullauto + availableModes: + - Fullauto + minAngle: 8 + maxAngle: 16 + angleIncrease: 4 + angleDecay: 16 + - type: Wieldable + - type: GunWieldBonus + minAngle: -7 + maxAngle: -15 - type: ItemSlots slots: gun_magazine: @@ -170,3 +207,57 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: advance 12.7mm SMG + parent: BaseWeaponSubMachineGun + id: N14WeaponAdvanceSubMachineGun12mm + description: A bulky sub machine gun with a top magazine fed system, it uses 12mm ammmo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi + - type: Gun + fireRate: 7 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + selectedMode: FullAuto + availableModes: + - FullAuto + minAngle: 16 + maxAngle: 30 + angleIncrease: 4 + angleDecay: 16 + - type: Wieldable + - type: GunWieldBonus + minAngle: -15 + maxAngle: -29 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14TopMagazineSMG12mm + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - N14TopMagazineSMG12mm + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol12.7 + priority: 1 + whitelist: + tags: + - N14CartridgePistol12.7 + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 7586d963a52..f213511bc86 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -2,12 +2,13 @@ name: double-barrel shotgun parent: BaseWeaponShotgun id: N14WeaponDoubleBarrelShotgun - description: An immortal classic. + description: An immortal classic, uses 12 gauge shells. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi + - type: Wieldable - type: Gun fireRate: 8 - type: BallisticAmmoProvider @@ -33,6 +34,7 @@ - N14ShellShotgun12 capacity: 6 proto: N14ShellShotgun12 + - type: Wieldable - type: entity name: combat shotgun @@ -51,8 +53,16 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi size: 30 + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 - type: Gun - fireRate: 2 + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 + fireRate: 3 selectedMode: FullAuto availableModes: - FullAuto @@ -86,12 +96,13 @@ name: caravan shotgun parent: BaseWeaponShotgun id: N14WeaponCaravanShotgun - description: The perfect shotgun for a long jorney. works well for hunting brahmins, geckos and bandits. + description: The perfect shotgun for a long jorney. works well for hunting brahmins, geckos and fiends, uses 20 gauge shells. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi + - type: Wieldable - type: Gun fireRate: 6 - type: BallisticAmmoProvider @@ -105,7 +116,7 @@ name: lever action shotgun parent: BaseWeaponShotgun id: N14WeaponLeverShotgun - description: The perfect gun for a cowboy close quarters fight. + description: The perfect gun for a cowboy, it uses 20 gauge shells. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi @@ -117,14 +128,22 @@ - N14ShellShotgun20 capacity: 8 proto: N14ShellShotgun20 + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 - type: Gun - fireRate: 5 + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 + fireRate: 3 - type: entity name: riot shotgun parent: BaseItem id: N14WeaponRiotShotgun - description: A compact fully automatic shotgun used by the police forces of the pre war, chambered in 20 gauge shells. + description: A compact semi automatic shotgun used by the police forces of the pre war, chambered in 20 gauge shells. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi @@ -136,11 +155,19 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 - type: Gun - fireRate: 2 - selectedMode: FullAuto + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 + fireRate: 4 + selectedMode: SemiAuto availableModes: - - FullAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg soundEmpty: diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 94e98be2ceb..b1e8ada2d69 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -8,7 +8,15 @@ sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 - type: Gun + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 - type: BallisticAmmoProvider whitelist: tags: @@ -29,9 +37,18 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - N14Cartridge.50 capacity: 5 - proto: CartridgeAntiMateriel + proto: N14Cartridge.50 + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 + - type: Gun + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 - type: entity name: lever action carbine @@ -43,7 +60,15 @@ sprite: Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 - type: Gun + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 fireRate: 3 - type: BallisticAmmoProvider whitelist: @@ -62,7 +87,15 @@ sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 - type: Gun + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 fireRate: 2 - type: entity @@ -75,10 +108,19 @@ sprite: Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi + - type: Wieldable - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge308Rifle capacity: 1 proto: N14Cartridge308Rifle + - type: GunWieldBonus + minAngle: -23 + maxAngle: -104 + - type: Gun + minAngle: 24 + maxAngle: 105 + angleIncrease: 4 + angleDecay: 16 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index b34e49bc28d..33be867be8c 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -26,6 +26,9 @@ Slash: 16 soundHit: path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: 15 + sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi - type: entity name: scrap machete @@ -42,6 +45,9 @@ Slash: 16 soundHit: path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: 15 + sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi - type: entity name: ripper diff --git a/Resources/Prototypes/Nuclear14/tags.yml b/Resources/Prototypes/Nuclear14/tags.yml index 57d4bdbd82d..a90c68026d1 100644 --- a/Resources/Prototypes/Nuclear14/tags.yml +++ b/Resources/Prototypes/Nuclear14/tags.yml @@ -33,6 +33,9 @@ - type: Tag id: N14Cartridge7.62Rifle +- type: Tag + id: N14Cartridge.50 + - type: Tag id: N14ShellShotgun12 @@ -64,6 +67,9 @@ - type: Tag id: N14MagazineSMG12mm +- type: Tag + id: N14TopMagazineSMG12mm + - type: Tag id: Magazine5.56Rifle @@ -79,6 +85,14 @@ - type: Tag id: N14MagazineShotgun20 +# Ammo tags(Battery). + +- type: Tag + id: N14PowerCellHigh + +- type: Tag + id: N14PlasmaCartridge + # Mobs - type: Tag id: Brahmin diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/icon.png new file mode 100644 index 00000000000..86da62145ea Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/meta.json new file mode 100644 index 00000000000..75fd0b6cbba --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/microfusion.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/icon.png new file mode 100644 index 00000000000..e9ed4191aa7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/meta.json new file mode 100644 index 00000000000..75fd0b6cbba --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Battery/plasma.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/base.png new file mode 100644 index 00000000000..d07c09319f1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-1.png new file mode 100644 index 00000000000..0640b1c68ef Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-2.png new file mode 100644 index 00000000000..f98e07b1d4f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-3.png new file mode 100644 index 00000000000..500449eb0cb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-4.png new file mode 100644 index 00000000000..edbff5865f8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/mag-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/topmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png index d1e085e8586..4af588bc4e7 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png index 61b8c10046d..07f9dfeda17 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..90d37babe1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json index e8a1c35e5aa..1fdf7926071 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "base" }, + { + "name": "mag-unshaded-0" + }, { "name": "mag-unshaded-1" }, diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-left.png index d1e085e8586..b13ce55d45e 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-right.png index 61b8c10046d..a6e562c7907 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/mag-unshaded-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..90d37babe1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/meta.json index e8a1c35e5aa..687fcc4a685 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "base" }, + { + "name": "mag-unshaded-0" + }, { "name": "mag-unshaded-1" }, @@ -32,6 +35,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..c6b4262083c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..9b2577f4f23 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/laser_rifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/base.png new file mode 100644 index 00000000000..2a016e81fd6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/icon.png new file mode 100644 index 00000000000..eb8f21a0fc4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/inhand-left.png new file mode 100644 index 00000000000..aecc1902848 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/inhand-right.png new file mode 100644 index 00000000000..b615db1eabf Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..2a8776d2c69 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..877c5a5e997 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..e911ac8078b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..7a72f9df016 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..9b4ee28aac2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/meta.json new file mode 100644 index 00000000000..0bc66b89276 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "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 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..1a6e47c0a3a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..60bd8acc521 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/multiplas.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-left.png index d1e085e8586..f4f06d748c4 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-right.png index 61b8c10046d..1f283ff8451 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/mag-unshaded-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..90d37babe1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/meta.json index afefdb05be7..71019e9b12f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_pistol.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "base" }, + { + "name": "mag-unshaded-0" + }, { "name": "mag-unshaded-1" }, diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-left.png index d1e085e8586..b78eebad967 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-right.png index 61b8c10046d..f1e42d7bad7 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/mag-unshaded-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..90d37babe1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/meta.json index afefdb05be7..fc9e90cf19f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "base" }, + { + "name": "mag-unshaded-0" + }, { "name": "mag-unshaded-1" }, @@ -32,6 +35,15 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } + diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..88c661684d3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..94bab9fad39 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_rifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/base.png new file mode 100644 index 00000000000..8ecf30d6df2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/icon.png new file mode 100644 index 00000000000..7199a6c39ac Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/inhand-left.png new file mode 100644 index 00000000000..6b04a9e6078 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/inhand-right.png new file mode 100644 index 00000000000..708ddffe6d5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..c8ff74f735c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..c38a7ceee57 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..b7777fa40d4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..a9cddf97035 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..b3d9ccb209c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/meta.json new file mode 100644 index 00000000000..e57a86da11f --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "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 + } + ] +} + diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..79347a2c68b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..1d2a8c20bf4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Battery/plasma_urban.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-left.png index c5742e680e3..d4772bb162b 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-right.png index 63a77465961..36bd81cae1f 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png index e1623ed229b..aaac97d416c 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/bolt-open.png index e63b23258df..714ccf463db 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/bolt-open.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/icon.png index 214c2d046c8..8398221d154 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/icon.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-left.png index 9d7876f6def..63eeae928dc 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-right.png index 8ebbc14e3ac..2313abc2d53 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/12mm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/base.png new file mode 100644 index 00000000000..2920311ce8a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/bolt-open.png new file mode 100644 index 00000000000..c3d650afc56 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/icon.png new file mode 100644 index 00000000000..50c84232108 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/inhand-left.png new file mode 100644 index 00000000000..2d8be83e5ec Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/inhand-right.png new file mode 100644 index 00000000000..560ee06b5db Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/mag-0.png new file mode 100644 index 00000000000..b11c8d329d8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/mag-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/meta.json new file mode 100644 index 00000000000..29128b14e81 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/22lr.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-left.png index c5742e680e3..efb5c3a97c4 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-right.png index 63a77465961..1e83c559b11 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/base.png new file mode 100644 index 00000000000..2b5d7b93035 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/bolt-open.png new file mode 100644 index 00000000000..4afba900989 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-left.png new file mode 100644 index 00000000000..b83e09f7608 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-right.png new file mode 100644 index 00000000000..e8fc9117e0f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/meta.json new file mode 100644 index 00000000000..a112eb4bccc --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png index c5742e680e3..b7c3971407f 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png index 63a77465961..6423710c9b7 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/colt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/base.png new file mode 100644 index 00000000000..8f498e064e6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/bolt-open.png new file mode 100644 index 00000000000..1db96b853eb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-left.png new file mode 100644 index 00000000000..4b5f320c95e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-right.png new file mode 100644 index 00000000000..66de1cb000b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/meta.json new file mode 100644 index 00000000000..a112eb4bccc --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-left.png index def85defae4..ee790ab35a2 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-right.png index 2aa960b9497..d910186c103 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/base.png index 201af68dac2..2586700fed2 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/base.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/bolt-open.png index 7415e68a833..706047b1d50 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/bolt-open.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png index f6f26d05e1a..fe5b50df1fa 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png index a5cf7900411..8fac2b92426 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-right.png index 4abeee911f0..b092da47de8 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json index 68f9d366f70..845772aae38 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json @@ -27,6 +27,14 @@ "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/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..fe1cf0c5ac5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..b021ec5f1b1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/bolt-open.png index 484e392dbd4..eb990e8b8ae 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/bolt-open.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png index e771f871091..5ec6420ed87 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-right.png index f1894180049..b7e5e836b99 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json index 68f9d366f70..845772aae38 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json @@ -27,6 +27,14 @@ "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/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..d82b514ed34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..8431d927a8b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png index 58bb4a5fbf3..dded58a681d 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png index 519d097215c..ad7e5883f34 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json index 68f9d366f70..44184a28a6f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json @@ -26,10 +26,18 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..abba035486f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..13cf4ba0b5b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-left.png index db077e53add..0dd353fc58b 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-right.png index 2b25432c9eb..5ecf9cda886 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json index ba4ecdeb028..f234f886fee 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json @@ -1,35 +1,44 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from Fortune13 at https://github.com/fortune13-ss13/Fortune13/pull/667/commits/3875432b7113c58ce53056d7cc662a979a36a4b8", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from Fortune13 at https://github.com/fortune13-ss13/Fortune13/pull/667/commits/3875432b7113c58ce53056d7cc662a979a36a4b8", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..8d447fb98e4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..53726313c90 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/bolt-open.png new file mode 100644 index 00000000000..a25db211379 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-left.png index f507d44cd2d..41e0b90358f 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-right.png index 903ff34e532..c380bb02822 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json index 348c10027b5..845772aae38 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "base" }, + { + "name": "bolt-open" + }, { "name": "mag-0" }, @@ -24,6 +27,14 @@ "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/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..16577108e4c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..feccd0c6aef Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png index f0b87d12ce8..c1dde7b57f0 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/bolt-open.png index e66c71ec001..f74561bead8 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/bolt-open.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png index d71ced2390f..574cbfe02f2 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-left.png index 0fde18ac05c..0f268388ed3 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-right.png index 2cafcff8f40..4344111efce 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png index c089ac82494..da30c9b3c93 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json index a9c4e32625b..8fa69134340 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified desertrose at https://github.com/DesertRose2/desertrose/pull/1282/commits/10ee00646d92bd9f3197a98f374e29f06686245d", + "copyright": "Made by PatoGrone for N14", "size": { "x": 32, "y": 32 @@ -26,6 +26,15 @@ { "name": "inhand-right", "directions": 4 - } - ] + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..84e46176b73 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..b529d9e0d37 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-left.png index 9dfe592de81..8aee4d89c88 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-right.png index afb543219fa..eb5936d7e37 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json index a9c4e32625b..1f00eadf458 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json @@ -26,6 +26,14 @@ { "name": "inhand-right", "directions": 4 - } - ] + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..f379f251305 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..f209bfc0837 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png index aef74dc8b2a..f602d4bedd0 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/bolt-open.png index cacf7d9d0e3..8e5f7803682 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/bolt-open.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png index dbf67318202..2cb9d67e1d2 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png index a1ea25624f9..4ccc9e55f4e 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png index c5fd34df702..b063b847223 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json index a9c4e32625b..8fa69134340 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified desertrose at https://github.com/DesertRose2/desertrose/pull/1282/commits/10ee00646d92bd9f3197a98f374e29f06686245d", + "copyright": "Made by PatoGrone for N14", "size": { "x": 32, "y": 32 @@ -26,6 +26,15 @@ { "name": "inhand-right", "directions": 4 - } - ] + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..257dd6247b9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..ef2e8cf47dd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-left.png index 9dfe592de81..054c89b47f0 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-right.png index afb543219fa..3628785f7b7 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json index a9c4e32625b..cb26b44b9ab 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json @@ -26,6 +26,14 @@ { "name": "inhand-right", "directions": 4 - } - ] -} + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..b65031a9190 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..8dcca7674f3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/base.png new file mode 100644 index 00000000000..8636b0feb54 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/bolt-open.png new file mode 100644 index 00000000000..4cb30f1d550 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/icon.png new file mode 100644 index 00000000000..cf6c1ca3598 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/inhand-left.png new file mode 100644 index 00000000000..55456494d9e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/inhand-right.png new file mode 100644 index 00000000000..9c5607fc54e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/mag-0.png new file mode 100644 index 00000000000..1de351ee999 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/mag-0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json new file mode 100644 index 00000000000..387cb77287b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified desertrose at https://github.com/DesertRose2/desertrose/pull/1282/commits/10ee00646d92bd9f3197a98f374e29f06686245d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "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/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..7c522b17417 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..cd3cf2d5efe Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json index f6b1dff871b..da5c0f8502f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json @@ -20,6 +20,14 @@ { "name": "inhand-right", "directions": 4 - } - ] -} + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..b6ad96606bb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..95badf5aeeb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-left.png index 4f139c9cfc5..366084b7821 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-right.png index 8309847e37b..d5b350fd6c6 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json index 0e7412189bd..eb37d9c72e7 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json @@ -1,31 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/commit/20275b34fd7f7a0542b47eb320bd11587dea85cc", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..adba41c4746 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..a663b344cee Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json index 7b6fa95e2fc..b346585e857 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json @@ -20,6 +20,14 @@ { "name": "inhand-right", "directions": 4 - } - ] + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..7e6936eca43 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..1d4f083fd3c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-left.png index f0363453dba..7e46f28c3d1 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-right.png index 04074b7fbd8..15819e3945a 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json index f6b1dff871b..da1a03d8cc5 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json @@ -1,25 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by PatoGrone for N14", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "icon" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..4d56bb2a04e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..e57c34bfaaf Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index 7b6fa95e2fc..b346585e857 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -20,6 +20,14 @@ { "name": "inhand-right", "directions": 4 - } - ] + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..7ed66710bb6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..f6dc7387040 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png index 094f41966e1..94eab766328 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-right.png index b753d87423a..3c38e4522ce 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json index 30425711fac..e70d1b35784 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json @@ -1,28 +1,37 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/commit/20275b34fd7f7a0542b47eb320bd11587dea85cc", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..9b3bcff603f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..f0ec4fbd60c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json index a112eb4bccc..358d5416b0b 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json @@ -1,25 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by PatoGrone for N14", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..86d61518c08 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..5c6947458fe Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-left.png index 89cb1e96679..ac912def65d 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-right.png index 9abd3852a4d..ba227804785 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json index 09476e57f00..b2d629d84a0 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json @@ -7,19 +7,28 @@ "y": 32 }, "states": [ - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "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/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..7129348c9e3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..11566fe2f7e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-left.png index 39462674fae..e1aae5ce9a4 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-right.png index 22a38eaae03..e11915324d5 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json index a112eb4bccc..358d5416b0b 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json @@ -1,25 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by PatoGrone for N14", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..c6419181e9a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..ed3fac964ab Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-left.png index 6b7b693007a..b8feaba2277 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-right.png index e76b0ad4dc8..eb984d19827 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json index a112eb4bccc..358d5416b0b 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json @@ -1,25 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by PatoGrone for N14", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..01ed07ad4b1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..a1c79600758 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/bolt-open.png new file mode 100644 index 00000000000..d6fcbbda8ee Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json index 4ba4b9d2ad7..358d5416b0b 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json @@ -1,22 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Fortune13 at https://github.com/fortune13-ss13/Fortune13/pull/667/commits/3875432b7113c58ce53056d7cc662a979a36a4b8", - "size": { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { "x": 32, "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 }, - "states": [ - { - "name": "base" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] } + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..8807fe56d31 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..6b43e3f595f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png index 11c94b81a7c..d8a8d72569b 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png index 5dc8f3627f2..a8270c025a9 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index ce78cfc2760..31d83c38c2a 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png index 910dda1a140..dc2e6a65cc7 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png index f928b92fb12..843c03e9398 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png index 65a94423945..1f2089c3cbe 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-left.png index 482a7c07b45..dd73496733b 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-right.png index cf25ad45f23..dd73496733b 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/hatchet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-left.png index aed2fbf0bdf..98c1e753ea9 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-right.png index 34dedbbf052..be7dd524dec 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-left.png index 0c5429a1e44..43362e1e7de 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-right.png index 566dc90ec87..42fb222eea7 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-right.png differ