diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 0d16f1e966..6b3dc8b1b4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -69,15 +69,15 @@ - type: Item size: Small - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-1 + - state: mag-4 map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 4 zeroVisible: false - type: Appearance @@ -108,7 +108,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 4 zeroVisible: false - type: Appearance @@ -128,7 +128,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 4 zeroVisible: false - type: Appearance @@ -148,7 +148,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 4 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 6a1cc041de..099ae0392f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -112,7 +112,7 @@ proto: CartridgeMagnumAP - type: Sprite layers: - - state: piercing + - state: red-icon map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index a366a5373f..b157553a60 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -19,7 +19,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + sprite: White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -27,7 +27,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 5 + steps: 2 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 0e7189519c..544aa73468 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -20,7 +20,7 @@ tags: - Sidearm - type: Clothing - sprite: Objects/Weapons/Guns/Pistols/viper.rsi + sprite: White/Objects/Weapons/Guns/Pistols/viper.rsi quickEquip: false slots: - suitStorage @@ -83,7 +83,7 @@ description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Pistols/viper.rsi + sprite: White/Objects/Weapons/Guns/Pistols/viper.rsi availableModes: - FullAuto - SemiAuto @@ -118,14 +118,16 @@ description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Pistols/cobra.rsi + sprite: White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: Objects/Weapons/Guns/Pistols/cobra.rsi + sprite: White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi - type: ChamberMagazineAmmoProvider boltClosed: null - type: Gun @@ -166,14 +168,14 @@ description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Pistols/mk58.rsi + sprite: White/Objects/Weapons/Guns/Pistols/mk58.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: Objects/Weapons/Guns/Pistols/mk58.rsi + sprite: White/Objects/Weapons/Guns/Pistols/mk58.rsi - type: Gun fireRate: 5 availableModes: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index d30f1d0a3f..2bc94e1a31 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -16,7 +16,7 @@ tags: - Sidearm - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/deckard.rsi quickEquip: false slots: - suitStorage @@ -69,7 +69,7 @@ description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/deckard.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -97,9 +97,11 @@ description: A detective's best friend. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi + - type: Item + sprite: White/Objects/Weapons/Guns/Revolvers/inspector-inhand.rsi - type: RevolverAmmoProvider capacity: 6 chambers: [ True, True, True, True, True, True ] @@ -112,9 +114,9 @@ description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Gun fireRate: 3 soundGunshot: @@ -127,9 +129,9 @@ description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/python.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/python.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/python.rsi + sprite: White/Objects/Weapons/Guns/Revolvers/python.rsi - type: Gun selectedMode: SemiAuto fireRate: 2 diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png new file mode 100644 index 0000000000..66c1e1c684 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png new file mode 100644 index 0000000000..bbd5fd452b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png new file mode 100644 index 0000000000..9b59430db6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png new file mode 100644 index 0000000000..ec8fafaabc Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png new file mode 100644 index 0000000000..b57a4a9e25 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json new file mode 100644 index 0000000000..6fc2690c8d --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "red-icon" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png new file mode 100644 index 0000000000..2e6fdf000b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png new file mode 100644 index 0000000000..1f62639352 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png new file mode 100644 index 0000000000..7633158750 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png new file mode 100644 index 0000000000..e07d809505 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png new file mode 100644 index 0000000000..f4d4866094 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png index 222f96a6bd..420adbf199 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png index f7f1814e3d..23a7c40e5e 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png index a0f813ea40..65a05d9ca0 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png index 8fe84d6068..e973ab89f1 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png index 5fb1df7ab0..f0e4df4750 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png new file mode 100644 index 0000000000..75f3bf8faa Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png new file mode 100644 index 0000000000..c9912267ce Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json new file mode 100644 index 0000000000..347011f1b8 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "mag-1" + }, + { + "name": "red-icon" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png new file mode 100644 index 0000000000..2b1cddabe5 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png new file mode 100644 index 0000000000..f9c1456785 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png new file mode 100644 index 0000000000..c55c751165 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png new file mode 100644 index 0000000000..2f9c8808a4 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png new file mode 100644 index 0000000000..283392cf1e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png index c3f6004365..59674acf55 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png index a81b015ac1..5c6589e934 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png index 1ab96ac2d2..a5a5731c5d 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png index 95c38c47fa..812ea8a5ca 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png index e53d44dcd2..2a3ebca77c 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png index b5638cf663..e586fb9f29 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png index 3875a30149..0f158e789e 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png index d82ec48dcb..45cc7bd580 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png index 0b62e57771..2f13a09205 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png index 7ed185ba81..85005222fb 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png index f372a044d9..3fb11afb90 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png index 87dce95b1f..9974f3dee0 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png index b514d721e7..ad7fc153e0 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png index 5088c1fb22..072ec57260 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png index c5ca110f94..9ed6d64037 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/base.png new file mode 100644 index 0000000000..860a9272f7 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/icon.png new file mode 100644 index 0000000000..e3b075cefa Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/mag-1.png b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/mag-1.png new file mode 100644 index 0000000000..7f0dc9d8b2 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/mag-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/meta.json new file mode 100644 index 0000000000..2626cd0713 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Sniper/Hristiov-mag.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/base.png new file mode 100644 index 0000000000..276abc3504 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/bolt-open.png new file mode 100644 index 0000000000..d212107d19 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/icon.png new file mode 100644 index 0000000000..6e0da00be6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/mag-0.png new file mode 100644 index 0000000000..fa0396c6e0 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/mag-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/meta.json new file mode 100644 index 0000000000..590558f7b4 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-icons.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "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": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-BELT.png new file mode 100644 index 0000000000..57fc3e0847 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..57fc3e0847 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-left.png new file mode 100644 index 0000000000..24ccabb7e0 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-right.png new file mode 100644 index 0000000000..5ea393f654 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/meta.json new file mode 100644 index 0000000000..2975dacfae --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png new file mode 100644 index 0000000000..2c4203f8ff Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-open.png new file mode 100644 index 0000000000..8cee3ddb19 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-BELT.png new file mode 100644 index 0000000000..3388584cc6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..3388584cc6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png new file mode 100644 index 0000000000..87a389089c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png new file mode 100644 index 0000000000..56c668c51a Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png new file mode 100644 index 0000000000..ddd41791e6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png new file mode 100644 index 0000000000..c48e44905d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/mag-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json new file mode 100644 index 0000000000..4e40f6e842 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "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": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/base.png new file mode 100644 index 0000000000..1fdcaac925 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/bolt-open.png new file mode 100644 index 0000000000..c72c589c8f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-BELT.png new file mode 100644 index 0000000000..529338c530 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..529338c530 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/icon.png new file mode 100644 index 0000000000..6f6b87c7c5 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png new file mode 100644 index 0000000000..c0b73601e7 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png new file mode 100644 index 0000000000..78675d8bfc Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/mag-0.png new file mode 100644 index 0000000000..9d833c6332 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/mag-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json new file mode 100644 index 0000000000..4e40f6e842 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "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": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png new file mode 100644 index 0000000000..07039a8dfc Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-BELT.png new file mode 100644 index 0000000000..7f6016c508 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..7f6016c508 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-left.png new file mode 100644 index 0000000000..46234000dd Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-right.png new file mode 100644 index 0000000000..a84eac25ba Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..a2c8728209 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..543e437ce4 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..74c98c3c8c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..41964cba12 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json new file mode 100644 index 0000000000..fb84e5e63c --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "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": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/bolt-open.png new file mode 100644 index 0000000000..572c01f6ce Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/icon.png new file mode 100644 index 0000000000..dc7ce8692f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/meta.json new file mode 100644 index 0000000000..19fbbef2e0 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/equipped-BELT.png new file mode 100644 index 0000000000..b95f9c6a50 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..b95f9c6a50 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..7972f41d5b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..70ca382e6a Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/meta.json new file mode 100644 index 0000000000..2975dacfae --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/bolt-open.png new file mode 100644 index 0000000000..c803d7c776 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-BELT.png new file mode 100644 index 0000000000..7f6016c508 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..7f6016c508 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png new file mode 100644 index 0000000000..30c50f630a Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png new file mode 100644 index 0000000000..0e1c05fd3e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png new file mode 100644 index 0000000000..528b11e43f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json new file mode 100644 index 0000000000..1faecd06b3 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png new file mode 100644 index 0000000000..535304b03b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png new file mode 100644 index 0000000000..7f6016c508 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..7f6016c508 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png new file mode 100644 index 0000000000..48a03ce46f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png new file mode 100644 index 0000000000..eeef407c74 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png new file mode 100644 index 0000000000..9e60ee8711 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json new file mode 100644 index 0000000000..1faecd06b3 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png index c073b72bbb..06e1fc8bd7 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/base.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/bolt-open.png index 7611eae733..540739166c 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/bolt-open.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png index de8d973e55..e8d491861f 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png index 6616f30973..1f9d1bf509 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/mag-0.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json index 63a9c39c91..aa3103274e 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi/meta.json @@ -3,7 +3,7 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { - "x": 48, + "x": 56, "y": 32 }, "states": [ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png index 951e6c0597..6127c2b652 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png index 1d21fe8bad..2c31a2f024 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png index cc9e874151..b4a053e508 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-left.png index 430c52dd58..845ce03594 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-left.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png index 53bfbe3639..b642cc9d8a 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png and b/Resources/Textures/White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi/wielded-inhand-right.png differ