diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index f5d855f704..c3684fb7a0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -99,6 +99,36 @@ - type: BatteryBarrel fireCost: 25 +- type: entity + name: PDW-10 pulse pistol + parent: BatteryGunBase + id: PulsePistolPdw + description: A state of the art energy pistol favoured as a sidearm by the NT-ERT operatives. + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi + - type: BatteryBarrel + fireCost: 25 + ammoPrototype: Pulse + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: PowerCellSlot + cellSlot: + ejectOnUse: true + soundOptions: + volume: -2 + startingItem: PowerCellSmallHigh + - type: entity name: cog laser carbine parent: BatteryGunBase @@ -120,6 +150,36 @@ - type: BatteryBarrel fireCost: 12 +- type: entity + name: DEAC-12 pulse carbine + parent: BatteryGunBase + id: PulseCarbineDeac + description: A high tech energy carbine favoured by the NT-ERT operatives. + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi + - type: BatteryBarrel + fireCost: 12 + ammoPrototype: Pulse + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: PowerCellSlot + cellSlot: + ejectOnUse: true + soundOptions: + volume: -2 + startingItem: PowerCellSmallHigh + - type: entity name: laser cannon parent: BatteryGunBase @@ -139,7 +199,7 @@ size: 24 sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi - type: BatteryBarrel - fireCost: 600 + fireCost: 200 ammoPrototype: RedHeavyLaser soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index a79863f478..49c60392c7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -189,20 +189,22 @@ name: lamia parent: PistolBase id: PistolLamia - description: A heavy pistol of Ironhammer enforcers. + description: A heavy pistol chambered in .40 Magnum. components: - type: Sprite - sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/lamia.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/lamia.rsi - type: Item size: 12 - sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi + sprite: Objects/Weapons/Guns/Pistols/lamia.rsi - type: RangedWeapon - type: MagazineBarrel caliber: Magnum @@ -210,7 +212,7 @@ - Pistol magFillPrototype: MagazineMagnum autoEjectMag: true - fireRate: 5 + fireRate: 3 minAngle: 0 maxAngle: 45 angleIncrease: 20 @@ -227,6 +229,7 @@ path: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg - type: Appearance visuals: + - type: BarrelBoltVisualizer - type: MagVisualizer magState: mag steps: 1 @@ -360,6 +363,36 @@ angleIncrease: 20 angleDecay: 60 +- type: entity + name: basilisk + parent: PistolBase + id: PistolBasilisk + description: A fully automatic handgun chambered in .40 magnum. Can use both pistol and SMG type magazines. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi + - type: Icon + sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi + - type: Item + size: 12 + sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Magnum + currentSelector: Automatic + allSelectors: + - Automatic + magazineTypes: + - Pistol + - Smg + magFillPrototype: MagazineMagnum + autoEjectMag: true + fireRate: 6 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + - type: entity name: olivaw parent: PistolBase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 85ce91a8f1..ffa4fe86d0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -11,6 +11,19 @@ muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png +- type: entity + name: pulse + id: Pulse + abstract: true + components: + - type: Hitscan + damage: + types: + Heat: 25 + spriteName: Objects/Weapons/Guns/Projectiles/pulse.png + muzzleFlash: Objects/Weapons/Guns/Projectiles/pulse_muzzle.png + impactFlash: Objects/Weapons/Guns/Projectiles/pulse_impact.png + - type: entity name: red heavy laser id: RedHeavyLaser diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index b83355e82e..1c9741bb83 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -48,6 +48,8 @@ layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon @@ -75,6 +77,7 @@ path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: + - type: BarrelBoltVisualizer - type: MagVisualizer magState: mag steps: 1 @@ -91,6 +94,8 @@ layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - state: mag-0 map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon @@ -118,6 +123,7 @@ path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: + - type: BarrelBoltVisualizer - type: MagVisualizer magState: mag steps: 1 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png new file mode 100644 index 0000000000..d068482092 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png new file mode 100644 index 0000000000..b9248426ff Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png new file mode 100644 index 0000000000..9010c4e793 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png new file mode 100644 index 0000000000..67152d8fdd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..8eceb96bf8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..6ed336f3c0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..d9e161f50c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..a8555a11fc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..f03415058a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json new file mode 100644 index 0000000000..746c6f6e69 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/cassad.dmi", + "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 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png new file mode 100644 index 0000000000..0a87a7f70b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png new file mode 100644 index 0000000000..4403dbd1a9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png new file mode 100644 index 0000000000..454b71176c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png new file mode 100644 index 0000000000..18a744d873 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..19ddce7ce5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..b988bc2f9e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..dc44efb5ec Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..5d07366fa6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..ac01fccee2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json new file mode 100644 index 0000000000..0dc0616f0b --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/pdw.dmi", + "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 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/base.png index 866b826ca6..e068cb506d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png index 22ee7b1303..bea51b9d11 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-open.png index 3e772bd763..a82a005f74 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/icon.png index 61951f164c..e0606bb6ad 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-0.png index e0229c2095..8a722b124e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-1.png index 3114329ebc..ec1e942aef 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-2.png index 4043c34852..08c1723b32 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-3.png index bb4cb48ada..a9efe9d72b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-4.png index 4a8b184454..e58c056458 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-5.png index c3a4498904..f75988751f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png index 98301721e3..5e1a6f519a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-closed.png new file mode 100644 index 0000000000..60d4d46b0a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-open.png new file mode 100644 index 0000000000..921724c19d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png index 97aabcc192..44d8881ac3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png index e589e3f172..21f8a4d875 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json index 7eef4dc9c1..56988b6b09 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json @@ -6,23 +6,29 @@ "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": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base-unshaded.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base-unshaded.png deleted file mode 100644 index 4d77cd9b9e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png index 9066e933a3..a7ede7f31f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-closed.png new file mode 100644 index 0000000000..f73e1a3252 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-open.png new file mode 100644 index 0000000000..47f32ac170 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png index da0c2b0fcf..5235ae89d1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png index dc086c8897..cd7cfbbd08 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-1.png deleted file mode 100644 index d3ffebb9e3..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-2.png deleted file mode 100644 index 365d962d29..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-3.png deleted file mode 100644 index 1a0487dc3c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-4.png deleted file mode 100644 index b8111fbe9c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/mag-unshaded-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json index 365b7da2af..934030079e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json @@ -1,43 +1,36 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/lamia.dmi", + "size": { + "x": 32, + "y": 32 }, - { - "name": "base" - }, - { - "name": "base-unshaded" - }, - { - "name": "mag-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 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + + }, + { + "name": "bolt-closed" + + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png index cb6628d20c..97019a9b55 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png index e08c797e9a..eaf9a9b3db 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png index 1e36e193df..50514b9f0a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png index 017d500b7d..10d9526098 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png index 1190f0ec2f..63dc55329c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json index c9887b95b8..fc8bfe1dec 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png index c8188820f6..ee9d3c2ed2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse.png new file mode 100644 index 0000000000..e79e098205 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_impact.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_impact.png new file mode 100644 index 0000000000..3bbb25ea2a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_impact.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_muzzle.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_muzzle.png new file mode 100644 index 0000000000..db3fd7b57c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_muzzle.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png index 8b0ad7e372..44c71ed23f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-closed.png new file mode 100644 index 0000000000..a405474fdd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-open.png new file mode 100644 index 0000000000..281690b3f9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png index 1bb1bcc76e..eb29b3793a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png index e0fa683783..12835bdb80 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json index 6d2cbbad28..bd1faf9098 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "size": { "x": 32, "y": 32 @@ -13,6 +13,12 @@ { "name": "base" }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png index a0ad21aae4..555798e317 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-closed.png new file mode 100644 index 0000000000..a405474fdd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-open.png new file mode 100644 index 0000000000..281690b3f9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png index 2dd6de65fc..b24a7ad785 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png index df4b968d1e..12835bdb80 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json index 6d2cbbad28..bd1faf9098 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "size": { "x": 32, "y": 32 @@ -13,6 +13,12 @@ { "name": "base" }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png index 52259c81d8..c9f14980b1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-closed.png index b4b6e3edb9..99ce0ca2ad 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-open.png index beb4a7c63e..50bce6907d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png index f8e82b4bfd..894f9973f0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png index 5571052625..b62ba13496 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index 69abd331be..76d9b060aa 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png index 16e1c0f992..573ce9823c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png index 09eba34d85..edf449189d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png index 85fc15d882..629432be86 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png index 9e9c202e78..503e46c0c6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png index f2c64aac25..5f1247ef37 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json index dd5b5244ad..1b1c80ca98 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/kovacs.dmi", + "size": { + "x": 32, + "y": 32 }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png index 4a082bc717..4074e81913 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png index fa4e700d15..1c207de6f3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png index a485e6abdf..ba36de46af 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png index c2013d076f..fcd0c8e12c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png index 5391875ca7..5b0254bd4c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png index 55c6f53388..0bf0af4613 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png index a6921cf4b4..a3def92083 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png index 1f96cf1a2a..78dfdcf820 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png index e581deae1a..e7bb7e033b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png index 92bd185eb9..adc5f77770 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png index 7c18d23dec..4e2c670395 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png index 6ca919c70e..0e22e345a9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index 822a91dba7..ad5d5a991d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3", + "size": { + "x": 32, + "y": 32 }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png index 2e654b42f5..445d8709a1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png index 08153449cf..11c3bef79c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json index 1843fa97b8..17e6f3319e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png index 1d3384ca75..9a07fb0537 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png index d53d968bc4..d0010185f4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-open.png index 563a8490c9..d15ac9f51c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png index a55c684db3..a4d5cfda80 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png index 05231bd863..cdaa86d894 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json index eac5d35284..46a3afd214 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/bojevic.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/bojevic.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png index 4e6d444716..68cec56d9c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json index e33f5993b2..a499314735 100644 --- a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Taral and Swept at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/c9ddcd603adeab3822c2845f6be9dfb53452c119", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png index 288f9fbce5..ec356bc791 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png index 956f7f7659..da1c4d5a80 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json index 87686c8a63..5068e960f6 100644 --- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/30680/commits/a494d500b42bc8c7275c57219e08e65b825e94f6", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from Cev-Eris at https://github.com/discordia-space/CEV-Eris/pull/4712/commits/f8baeca66b8af61347186f887bed20431ea8180f", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png index 64612928df..0f99f31a9f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png index f0815e8c6b..3628524b6c 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png index 346c636e54..b08efd07a7 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json index a7df3b3f7a..ae93abf331 100644 --- a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from TerraGov-Marine-Corps and modified by Taral at https://github.com/tgstation/TerraGov-Marine-Corps/commit/4c8cb6eb48dece03478b0f83542855f7c63b793e#diff-a67180777ae47f2c84f3ebf93c61442bbe34aebcad5b7cbd76feb78f177bcee1", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from goonstation and modified by Taral at https://github.com/goonstation/goonstation/pull/6094/commits/c8b97b970d189e566f63b74c6b453b016a5391c5", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] }