diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index d571fa85a5347..1e5e5993d539e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -20,7 +20,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi - type: MagazineVisuals magState: mag - steps: 4 + steps: 5 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 15b7818be8d7f..f19adab70155e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -20,7 +20,7 @@ sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi # DS14-texture-localization - type: MagazineVisuals magState: mag - steps: 4 + steps: 5 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 28dfa030d5796..9f79c49649e15 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -20,7 +20,7 @@ sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi # DS14-texture-localization - type: MagazineVisuals magState: mag - steps: 4 + steps: 5 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index bee7b337496a4..88ef65d3f5f1b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -19,7 +19,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi - type: MagazineVisuals magState: mag - steps: 4 + steps: 5 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 416b157fbc8e0..a01d00b6658a8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -20,7 +20,7 @@ sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi # DS14-texture-localization - type: MagazineVisuals magState: mag - steps: 3 + steps: 4 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index aae06e8fff68b..64fbfe39e32e0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -19,7 +19,7 @@ sprite: _DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi # DS14-texture-localization - type: MagazineVisuals magState: mag - steps: 4 + steps: 6 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 049271f998092..b9090b73b7443 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -26,7 +26,7 @@ capacity: 16 - type: MagazineVisuals magState: mag - steps: 5 + steps: 3 zeroVisible: false - type: Appearance @@ -40,7 +40,7 @@ proto: ShellShotgunBeanbag - type: MagazineVisuals magState: mag-beanbag - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: @@ -74,7 +74,7 @@ proto: ShellShotgunSlug - type: MagazineVisuals magState: mag-slug - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: @@ -93,7 +93,7 @@ proto: ShellShotgunFlare - type: MagazineVisuals magState: mag-flare - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: @@ -112,7 +112,7 @@ proto: ShellShotgunIncendiary - type: MagazineVisuals magState: mag-incend - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: @@ -131,7 +131,7 @@ proto: ShellShotgunUranium - type: MagazineVisuals magState: mag-uranium - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: @@ -150,7 +150,7 @@ proto: ShellShotgunPractice - type: MagazineVisuals magState: mag-practice - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: @@ -169,7 +169,7 @@ proto: ShellTranquilizer - type: MagazineVisuals magState: mag-tranq - steps: 5 + steps: 3 zeroVisible: false - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml index 3e0604cfa9c69..ffacb3915f2b3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml @@ -41,7 +41,7 @@ capacity: 50 - type: MagazineVisuals magState: mag-cap - steps: 4 + steps: 5 zeroVisible: false - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi 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 4c3207b9c5232..61f864d4a9501 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 @@ -28,7 +28,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 5 zeroVisible: false - type: Appearance @@ -105,8 +105,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: MagazineVisuals magState: mag steps: 6 @@ -117,11 +116,11 @@ left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" - type: entity id: MagazineCaselessRifle @@ -156,15 +155,14 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index c94e819615ca4..a40f19a7c3b3b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -51,7 +51,7 @@ sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi - type: MagazineVisuals magState: mag - steps: 8 + steps: 5 zeroVisible: false - type: Appearance @@ -112,18 +112,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" - type: entity id: MagazineLightRifleUranium @@ -139,18 +138,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#00cd42" + - state: uranium - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#00cd42" + color: "#01501c" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#00cd42" + color: "#01501c" - type: entity id: MagazineLightRifleIncendiary @@ -166,15 +164,14 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#ff6e52" + - state: incendiary - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ff6e52" + color: "#3f1329" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ff6e52" + color: "#3f1329" 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 3694186d682d5..40c14d58fe72e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -27,7 +27,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 7 zeroVisible: false - type: Appearance # DS14-start @@ -65,7 +65,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 9 zeroVisible: false - type: Appearance # DS14-start @@ -103,7 +103,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 6 + steps: 8 zeroVisible: false - type: Appearance # DS14-start @@ -135,7 +135,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-unshaded-1 map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - type: MagazineVisuals magState: mag steps: 6 @@ -211,18 +210,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#ff6e52" + - state: incendiary - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ff6e52" + color: "#3f1329" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ff6e52" + color: "#3f1329" - type: entity id: MagazinePistolPractice @@ -238,18 +236,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" - type: entity id: MagazinePistolUranium @@ -265,18 +262,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#00cd42" + - state: uranium - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#00cd42" + color: "#01501c" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#00cd42" + color: "#01501c" - type: entity id: MagazinePistolHighCapacityEmpty @@ -325,25 +321,24 @@ parent: BaseMagazinePistolHighCapacity components: - type: BallisticAmmoProvider - proto: CartridgePistol + proto: CartridgePistolPractice - type: Sprite layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" - type: entity id: MagazinePistolSubMachineGun @@ -407,18 +402,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" - type: entity id: MagazinePistolSubMachineGunUranium @@ -434,18 +428,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#00cd42" + - state: uranium - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#00cd42" + color: "#01501c" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#00cd42" + color: "#01501c" - type: entity parent: BaseMagazinePistolSubMachineGun @@ -461,16 +454,14 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#ff6e52" + - state: incendiary - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ff6e52" + color: "#3f1329" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ff6e52" - + color: "#3f1329" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 8e05d114d7c05..30ae54fab3b8f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -88,18 +88,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#ff6e52" + - state: incendiary - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ff6e52" + color: "#3f1329" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ff6e52" + color: "#3f1329" - type: entity id: MagazineRiflePractice @@ -115,18 +114,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" + - state: practice - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#dbdbdb" + color: "#76270d" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#dbdbdb" + color: "#76270d" - type: entity id: MagazineRifleUranium @@ -142,15 +140,14 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#00cd42" + - state: uranium - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#00cd42" + color: "#01501c" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#00cd42" + color: "#01501c" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 1017e956d2291..de5975cf2c1cc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -20,12 +20,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#d73307" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#d73307" - type: ContainerContainer containers: ballistic-ammo: !type:Container @@ -68,12 +64,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#ba7710" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#ba7710" - type: entity id: MagazineShotgunBeanbag @@ -93,11 +85,11 @@ left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#30722d" + color: "#383838" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#30722d" + color: "#383838" - type: entity id: MagazineShotgunSlug @@ -117,11 +109,11 @@ left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#72382d" + color: "#383838" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#72382d" + color: "#383838" - type: entity id: MagazineShotgunIncendiary @@ -134,6 +126,7 @@ layers: - state: base map: ["enum.GunVisualLayers.Base"] + - state: incendiary - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - type: Item @@ -141,8 +134,8 @@ left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#72382d" + color: "#3f1329" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#72382d" + color: "#3f1329" diff --git a/Resources/Prototypes/_ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotguns.yml b/Resources/Prototypes/_ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotguns.yml index 0c329413b2db1..608896146fd89 100644 --- a/Resources/Prototypes/_ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotguns.yml +++ b/Resources/Prototypes/_ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotguns.yml @@ -70,7 +70,7 @@ proto: ShellShotgunIncendiary - type: Sprite layers: - - state: base + - state: incendiary map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Carbines/sks.yml b/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Carbines/sks.yml index d39e781879a00..c8434d3dac9d1 100644 --- a/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Carbines/sks.yml +++ b/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Carbines/sks.yml @@ -138,7 +138,7 @@ proto: CartridgeLightRifleIncendiary - type: Sprite layers: - - state: red + - state: incendiary map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Pistols/desert_eagle.yml b/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Pistols/desert_eagle.yml index c3a50cdf9bd20..291992ab88fcf 100644 --- a/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Pistols/desert_eagle.yml +++ b/Resources/Prototypes/_DeadSpace/Entities/Objects/Weapons/Guns/Pistols/desert_eagle.yml @@ -26,7 +26,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 7 zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/ammo.yml b/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/ammo.yml index d29e92ea6c312..ead8090abf74d 100644 --- a/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/ammo.yml +++ b/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/ammo.yml @@ -139,7 +139,7 @@ proto: ShellShotgunDragon - type: MagazineVisuals magState: mag-practice - steps: 5 + steps: 3 zeroVisible: false - type: Sprite sprite: _DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi diff --git a/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/weapon.yml b/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/weapon.yml index ea8fd6c0fe2d1..0ac90da2889be 100644 --- a/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/weapon.yml +++ b/Resources/Prototypes/_DeadSpace/Necromorphs/BSAA/weapon.yml @@ -283,8 +283,22 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#cc4502" + - state: practice + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#76270d" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#76270d" # Арес diff --git a/Resources/Prototypes/_DeadSpace/Necromorphs/TheCircle/weapon.yml b/Resources/Prototypes/_DeadSpace/Necromorphs/TheCircle/weapon.yml index a8dfeea61ecc3..29a11777b2f34 100644 --- a/Resources/Prototypes/_DeadSpace/Necromorphs/TheCircle/weapon.yml +++ b/Resources/Prototypes/_DeadSpace/Necromorphs/TheCircle/weapon.yml @@ -267,7 +267,7 @@ sprite: _DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi - type: MagazineVisuals magState: mag - steps: 8 + steps: 5 zeroVisible: false - type: Appearance diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png index 1f2b2fe287533..f430f47f8bbb0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png index 6a141b7efb1fa..fb731a2642307 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png index 2414fe500b9c2..b8a2f958a786e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png index 1784e7f62362b..1b0de4acfa714 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-4.png new file mode 100644 index 0000000000000..54a60c8a74ad0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json index 942f06d0b8b8b..0ab8d1c01a744 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -18,6 +18,9 @@ }, { "name": "mag-3" + }, + { + "name": "mag-4" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png index 1685543539f94..da43224474478 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png index c9f029f32a3f3..89cfd6baf59bd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png index 84725cfd32184..8a341c9f2d146 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png index 532baa546b3c5..dd4e88c3facfe 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..141bf08a57661 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json index 1cde5f06786a8..fc9dd1e802715 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, { "name": "practice" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png index 99548b3e5b42d..e5aad546f3f18 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png index ef44262042f0e..62a62cc29e254 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png index 907b6040c276f..e4866d9c92c67 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png index 36c872a426860..c4765c84563e1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png index 025bec650e008..0c4d2fe83ee09 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png index 31c1c6b5c7629..38ec8f83252e8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..eb25c732e9033 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json index f20e7373cec6c..80e3b6fe7f45c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png index b252261c160cd..5efe17e9cd6f7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png index 7fefe0c6b9f7f..f5345270066fc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png index 150b4b15cfd30..70807249551ff 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png index 153b43e441c89..f5e0686d2c724 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capbase.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png index f6fb71b69d5bd..62949ffc9c10c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png index 8b7d23dc6c4dc..1ea0d818180e6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png index 6d2b4034e1f16..c7cc46f4e6d5b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png index 7d2bcd29ec220..52a8f6a87f86f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-4.png new file mode 100644 index 0000000000000..76da55e4ddeb9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png index e134075bcc044..e0f0dbd283720 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png index f75e4eba6e0c7..b5e7be2c31fa8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png index 247c9ac22bbd3..ca6c524abd97c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-4.png new file mode 100644 index 0000000000000..683be91ad826f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-cap-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json index 69b4639e0423c..86cdccb20f09d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -22,6 +22,9 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, { "name": "mag-cap-1" }, @@ -31,6 +34,9 @@ { "name": "mag-cap-3" }, + { + "name": "mag-cap-4" + }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png index 83910ba263a77..b4bab7c4bf814 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png index 7aa10042614a3..1eb4875bb9053 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png index 90238cf3c2759..fab592a478786 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png index ac7de8b43bd0a..32334fe6582fc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png index 226711c301a27..4c18562b2cfd6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png index 1d8de97957ef2..acac9bb4026b7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png index 43d1f0f5f71c5..8a7c7c179c70c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png index 5d6d61f5dbfb5..16d9567fed8c8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png new file mode 100644 index 0000000000000..cd15998943f30 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json index 1dbd2630eeb5b..6056dba3c1b08 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -16,6 +16,9 @@ { "name": "mag-2" }, + { + "name": "mag-3" + }, { "name": "incendiarydisplay" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png index 6911805ffae20..65ac07461249e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png index 1dba694fefb2d..84fcf8c1547ee 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png index 6db2100a88ae0..734a727b2b2e3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png index e10d99713b599..f75a7b3d8b62d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png index 4d7eb62cbf22a..43d00be9f21c5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png index 24cf3a37fb93b..b0c555c0cd9cc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png index 68bb5da7bed97..53442f758a394 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..c62ff1e32a517 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png new file mode 100644 index 0000000000000..487af3d586560 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png index fa9078d13092c..39e05c721147d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png index 991de0716e278..8fd938dce0bef 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png index 968c3241e62c6..6a77161ab2695 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-big-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index b6e5c821ccc7e..700cf4af48826 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -22,6 +22,12 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, { "name": "mag-big-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png index 6d5337b8bffef..149cb2ffbf7a5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png index 8dede3071ea2d..8c4cd351ca3d6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png index 008a736315156..e3e97de0971dc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png index e6f277ba843b6..61be0d5f15e3e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png index d734c66d19dde..eb1b9ee496877 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png index 554baa942411b..f328c6ab6ba75 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png index 549c922495334..648213bcf76ba 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png index 8a48bb884df03..19888249458f9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png index db541f8acbcf1..a02fc4e11d6c9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png deleted file mode 100644 index b6a01032d942a..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png deleted file mode 100644 index a6325d2d8491b..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png index 12b18cf8b4d9c..316080488b8b5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png index e71c0f5418efc..87604e77e145c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png deleted file mode 100644 index 81b11d41279e5..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png deleted file mode 100644 index e167574f17cec..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-beanbag-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png index 2d19b37d0e401..dcc236a4b7278 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png index 3581b4b9002df..a20148e8ca947 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png deleted file mode 100644 index fb1c27958a824..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png deleted file mode 100644 index bd0804e5169bc..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-flare-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png index 6cb866d75df8d..dcc236a4b7278 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png index 9a23c7bd0ad54..a20148e8ca947 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png deleted file mode 100644 index d7e2b98a72e59..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png deleted file mode 100644 index 13003e77fb7bd..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-incend-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png index cdb6cc85fad6d..05781a01bb3b5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png index 876f61936f46d..efe08d289b743 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png deleted file mode 100644 index 138dd64b31bba..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png deleted file mode 100644 index 2dfd5a4beb875..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-practice-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png index fb6e50a80b8e4..dfd094dcb9ec2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png index 73135e3f3b34e..841237fb7bc53 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png deleted file mode 100644 index 2a5e3541d01b0..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png deleted file mode 100644 index 08bc0fb1fcfb7..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-slug-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png index 48518c8557e8e..d4617801e430c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png index c7738a23b6bbf..7c7a2616eeaf9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png deleted file mode 100644 index 563dc39ccbb87..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png deleted file mode 100644 index abb6a10c68e01..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-tranq-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png index 7f8e0d839eb3a..316080488b8b5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png index 4b23d08f91cbd..87604e77e145c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png deleted file mode 100644 index 85f6f4bcfbeca..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png deleted file mode 100644 index 7c1d53e83158f..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-uranium-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json index b09d33fb11acc..990631d523e8d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -16,96 +16,48 @@ { "name": "mag-2" }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, { "name": "mag-beanbag-1" }, { "name": "mag-beanbag-2" }, - { - "name": "mag-beanbag-3" - }, - { - "name": "mag-beanbag-4" - }, { "name": "mag-slug-1" }, { "name": "mag-slug-2" }, - { - "name": "mag-slug-3" - }, - { - "name": "mag-slug-4" - }, { "name": "mag-practice-1" }, { "name": "mag-practice-2" }, - { - "name": "mag-practice-3" - }, - { - "name": "mag-practice-4" - }, { "name": "mag-tranq-1" }, { "name": "mag-tranq-2" }, - { - "name": "mag-tranq-3" - }, - { - "name": "mag-tranq-4" - }, { "name": "mag-uranium-1" }, { "name": "mag-uranium-2" }, - { - "name": "mag-uranium-3" - }, - { - "name": "mag-uranium-4" - }, { "name": "mag-flare-1" }, { "name": "mag-flare-2" }, - { - "name": "mag-flare-3" - }, - { - "name": "mag-flare-4" - }, { "name": "mag-incend-1" }, { "name": "mag-incend-2" }, - { - "name": "mag-incend-3" - }, - { - "name": "mag-incend-4" - }, { "name": "lethal" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png index 1bf826775ba9f..da3a92267a310 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png index c8fe67cce6e5b..567b310c385f6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png index fdd3b5e5d23af..7a2b1bcaa9bee 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png index 7da6702f4311b..c9ddcb775d929 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png index c6f01ff6a343f..cccb20f49894d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png index f3ae457fe6c09..21a8411c1b46e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png index d6a0429b66b1a..a2f80db479e46 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png index 01aa3bcd82b5d..4821a1592bf45 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png index 96aeeb5e16b8f..b71d03c0da142 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png index ab0c6ae7fac69..6ae8ffd670bad 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium-spent.png index f9e579ef05861..66700feef05d2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium.png index a2f639b297f75..ead82ea477b37 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/depleted-uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png index 56e19aff71ce0..075de2c77ce71 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png index e3cd98eaa4de4..ce5e535fbb1af 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png index cca772d66f5a6..09d5bac787bfa 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png index 6d600ab9ce277..5a9ba3352b7e6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/improvised.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png index 94a4985c5ed06..29841d4d866ee 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png index 9cb4631d2efbb..494da5a67538b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json index a7aa232decfff..74dcd690c8bdb 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, uranium ammo is a modification of the slug sprite by Boaz1111", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, uranium ammo is a modification of the slug sprite by Boaz1111, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png index fd5853a5855a7..da4e38e727cfd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png index 59327363428e5..02c20ea6cf88e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png index 9ffacd7ef04d0..94cd5580e401e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png index 07455f041c7b1..5869b590a3ca2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png index 1f05d6388de55..cee1fc87ed984 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png index 9eaa42de8440c..47f2baa826992 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png index bc8f94d8c0cf9..898e76e897288 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png index 1dcade4719658..65ab02ae884f5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png index 71fb4211b2f70..00214de74239f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png index 5e45bdbffd7f4..5103ccd9e0c36 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png index bcfbb26815e3a..dd1ffd4e74e9a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png index e6c98a07648f5..2ddca59f9f9c0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json index e78af4ebce6b9..464f69fb6a25e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, inhands by TiniestShark (github)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, inhands by TiniestShark (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -46,6 +46,9 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "practice" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png new file mode 100644 index 0000000000000..5655cddabe0e9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png index 203c265c37547..898e76e897288 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png index b3c57a440a4aa..abc46620b40cb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png index 1108df213803e..217199175eee5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png index 54bf062641e2b..61c7a4aa034f1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-2.png new file mode 100644 index 0000000000000..4ceac48ff8bbc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-3.png new file mode 100644 index 0000000000000..09e4bfbfda83c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-4.png new file mode 100644 index 0000000000000..dc45f78a3237e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json index 6c00eec2ad8d3..d08f76d60b7d4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -16,6 +16,15 @@ { "name": "mag-1" }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, { "name": "inhand-left-mag", "directions": 4 @@ -31,6 +40,9 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "practice" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png new file mode 100644 index 0000000000000..686bc2d36c792 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png index 779465c927295..2f126e09bbe64 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png index 441a6c0509bcf..eb44fcf580776 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png index 147284077d984..ed227544fee9a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png index a71a4f09d40d7..38362e2651ca4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png index dbe6fa3cb6fa1..1c60ff37fa523 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png index 59a68c42ae72e..e392689d14e14 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png deleted file mode 100644 index 4792b796df87e..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-6.png deleted file mode 100644 index 66ef44d856cca..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-7.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-7.png deleted file mode 100644 index 5c97cb5da0a7d..0000000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json index e2feab81c61b6..1c6263524ca1c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json @@ -22,15 +22,6 @@ { "name": "mag-4" }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - }, - { - "name": "mag-7" - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png index 6494362218419..da4a25b172f63 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/incendiary.png new file mode 100644 index 0000000000000..229caa22104c8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png index e04d1254abc29..849cd20b7f719 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json index 450d3bb843289..a58718f6cfe88 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json @@ -5,7 +5,7 @@ "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, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -34,6 +34,15 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png new file mode 100644 index 0000000000000..f0532845801b0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png index 3990c78a2eddd..da4a25b172f63 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png index 4c1ec65866d22..42c0044031d96 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png new file mode 100644 index 0000000000000..cc2f47bdd385d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png index f67facc89b371..31b8474d5d1fb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/incendiary.png new file mode 100644 index 0000000000000..993ce6fb6a9f7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png index fcb04ff1680ae..6d5c8f891552e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png index 5dc3360bbd3fa..fb67128794296 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png index 92b1fabbca33d..106f444da3ecd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png index 510b8fe19ecf7..f44d6b92713e0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png index 842b8e5ebf589..6577cbbebfc32 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png new file mode 100644 index 0000000000000..a13878cc1de5b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-7.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-7.png new file mode 100644 index 0000000000000..dc1552fdfb38d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-7.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-8.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-8.png new file mode 100644 index 0000000000000..2ed9db5e713a0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-8.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index 4a31ca1326f0b..71fa9ee9d4f44 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -28,6 +28,15 @@ { "name": "mag-5" }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, { "name": "inhand-left-mag", "directions": 4 @@ -43,6 +52,15 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png new file mode 100644 index 0000000000000..66f9ef58ce127 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png index cb0f5c8df036d..66ccb3fd3df78 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png new file mode 100644 index 0000000000000..5c3ab4d3ea8af Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png index d9dd41e903fb6..c52ddb924cf47 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/incendiary.png new file mode 100644 index 0000000000000..993ce6fb6a9f7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png index 917b415486798..08b10477dd2f7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png index 8a0c6aa651a9c..3e8785373b454 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png index be2b506781429..b8d7567981991 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png index 105fd48a78056..3e5b2ef13c062 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png index ffe088a3d7bff..9927dcb75450b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-6.png new file mode 100644 index 0000000000000..8b6bd92ee0b5d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json index ad008dad90ea7..a5f5dabef91ef 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -31,6 +31,9 @@ { "name": "mag-5" }, + { + "name": "mag-6" + }, { "name": "inhand-left-mag", "directions": 4 @@ -46,6 +49,15 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png new file mode 100644 index 0000000000000..66f9ef58ce127 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png index fb3bd2209c618..c52ddb924cf47 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png index 917616604b061..66ccb3fd3df78 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png new file mode 100644 index 0000000000000..5c3ab4d3ea8af Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png index c24879900ca08..a2f58da9a599b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/incendiary.png new file mode 100644 index 0000000000000..6019c0221f221 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png index b024dec5e07d8..3117a49484414 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png index d61085019a7ae..b6c0a0465867d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png index d3b34d48ab3d3..2577a121ffbe4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png index fa241d1742cff..ca8550ca01799 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png index 29d519e2c5d4a..637924a80f0b0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-6.png new file mode 100644 index 0000000000000..a19e78da8cf5b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-7.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-7.png new file mode 100644 index 0000000000000..ae49c879b3b92 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-7.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json index 95a4ced44af91..0796605f46246 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -34,6 +34,12 @@ { "name": "mag-5" }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, { "name": "inhand-left-mag", "directions": 4 @@ -49,6 +55,15 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png new file mode 100644 index 0000000000000..632cdeb38d1a5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png index 7575ed150c31c..a7492ec5cbc48 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png index 598770e39b83c..a2f58da9a599b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png index bb889f3dff622..f05bf67adda92 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png new file mode 100644 index 0000000000000..70d2e6df69c92 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png index f8d892f85ba9e..598abe4c4bdb2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png index f41552e052945..855b06f352e3a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png index 5a2edcc997067..7fd7247891b85 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png index 43639e90f73f4..bc606bff4b808 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png index a1e45f380f1de..7b3e26acfe689 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png index dfb0aaaf29a0a..bfeb0844e3552 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json index ead6df3a3760c..633aa6f12d4b1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png index 3c0c3e3217cd4..4619cb13eab71 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/incendiary.png new file mode 100644 index 0000000000000..ec10c80a956fb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png index 7f50103257281..75598968bb691 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json index 75f309c580dfc..ccd45cf1b2660 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", + "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -31,6 +31,15 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png new file mode 100644 index 0000000000000..a7ebfb6f696e4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png index 1677c8d25d8c1..6dd9214d67db2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png new file mode 100644 index 0000000000000..e040617a2eca8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png index e2a9b2bf56996..654c605f10b7d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png index df890d94b6268..18d6393380a64 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/beanbag.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/incendiary.png new file mode 100644 index 0000000000000..7bf1ed6ccd596 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png index 06b50bc42d18c..d1a18d16473b7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json index eaa0f484ad19c..9c3ad3c659bbd 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -37,6 +37,9 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "incendiary" + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png index 6832620ac629a..654c605f10b7d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png index 19c80df80cc97..74a9673b0c4f7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/base.png index a1d04ba964435..417c0aa017ab6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-1.png index 937bb31e49c72..6729b6af5012b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-2.png index 18eff624b798e..6cae4ad0fc2a9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-3.png index bbdd2f7b3896b..dc21eae14f4c6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-4.png index a492c486d6d47..0d4ee2ed01359 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-5.png index 812f24ed45b5e..2a527253ec82d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-5.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/base.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/base.png index d71ecc349e4c9..29fbbd31f4943 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/base.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/mag-1.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/mag-1.png index e04d1254abc29..d947f9514ddca 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/mag-1.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/meta.json b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/meta.json index 3c068b5003620..98725cd066cb1 100644 --- a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/meta.json +++ b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/ext_rifle_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Created bu Adventure Time Team", + "copyright": "Created bu Adventure Time Team, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/base.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/base.png index 9a9012d690080..e986b52936b55 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/base.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/base.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/beanbag.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/beanbag.png index 2f09cd0d307ab..d81496cfea2ea 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/beanbag.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/beanbag.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/incendiary.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/incendiary.png new file mode 100644 index 0000000000000..3dc4f4c36b976 Binary files /dev/null and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/incendiary.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/mag-1.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/mag-1.png index f5ef0fbf45a9d..e3ea2a4ec8701 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/mag-1.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/mag-1.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/meta.json b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/meta.json index 5903ecb0fd297..5b26fd1b9b02f 100644 --- a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/meta.json +++ b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "art by RED idea and code by nope_ingeneer", + "copyright": "art by RED idea and code by nope_ingeneer, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -21,6 +21,9 @@ }, { "name": "mag-1" - } + }, + { + "name": "incendiary" + } ] } diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/pellets.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/pellets.png index 7e4026f56e89c..e986b52936b55 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/pellets.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/pellets.png differ diff --git a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/slug.png b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/slug.png index 9fdf9f5c0b9cc..f905cb56e3c61 100644 Binary files a/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/slug.png and b/Resources/Textures/_ADT/Objects/Weapons/Guns/Ammunition/Magazine/xl.rsi/slug.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/base.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/base.png index 1e0273374a986..60be128544378 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/base.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/mag-1.png index 7be9362754a35..69ae202fbe078 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/meta.json b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/meta.json index ee1c1fb4cf703..5b83ecc58f66e 100644 --- a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/magazine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, resprite by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, resprite by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/base.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/base.png index d5fb2e69faa63..a6df1868cdb4c 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/base.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/mag-1.png index 76472f317772c..e5e2fc2ef095d 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/meta.json b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/meta.json index 6bcbd348ddfb5..89f26632369a1 100644 --- a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/round_magazine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос", + "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/base.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/base.png index 1e0273374a986..60be128544378 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/base.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/mag-1.png index e40f30877adbb..e2a6a7c3efb46 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/meta.json b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/meta.json index 4a963f3285e2f..5b83ecc58f66e 100644 --- a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_magazine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, resprite by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/base.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/base.png index d5fb2e69faa63..a6df1868cdb4c 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/base.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/mag-1.png index 72d55fe6bac5b..99f3784a8666f 100644 Binary files a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/meta.json b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/meta.json index 6bcbd348ddfb5..89f26632369a1 100644 --- a/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Items/Toys/TommyGun/toy_round_magazine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос", + "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/base.png index 42e4c96886d5c..13de9f2300516 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/mag-1.png index e04d1254abc29..d947f9514ddca 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/meta.json b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/meta.json index 8f9a3691a454e..d4b085320f03f 100644 --- a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Ares/magburn.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Created bu Adventure Time Team, resprited by thezuti(discord) for Space Station 14 server Мёртвый Космос", + "copyright": "Created bu Adventure Time Team, resprited by thezuti(discord) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/base.png index 1685543539f94..da43224474478 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-1.png index c9f029f32a3f3..89cfd6baf59bd 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-2.png index 84725cfd32184..8a341c9f2d146 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-3.png index 532baa546b3c5..dd4e88c3facfe 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-3.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..141bf08a57661 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/meta.json index 1cde5f06786a8..fc9dd1e802715 100644 --- a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, { "name": "practice" } diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/practice.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/practice.png index d53ab186152bb..ed0df8b8740bd 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/practice.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/caseless_rifle.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/base.png index 6db2100a88ae0..734a727b2b2e3 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-1.png index 4d7eb62cbf22a..43d00be9f21c5 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-2.png index 24cf3a37fb93b..b0c555c0cd9cc 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-3.png index 68bb5da7bed97..53442f758a394 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-3.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..c62ff1e32a517 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-5.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-5.png new file mode 100644 index 0000000000000..487af3d586560 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/mag-5.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/meta.json b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/meta.json index 1cde5f06786a8..ef5798efb2063 100644 --- a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -19,6 +19,12 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, { "name": "practice" } diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/practice.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/practice.png index a3a47dbe6924c..c0ab5956de683 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/practice.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/rifle.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/base.png index 008a736315156..e3e97de0971dc 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-1.png index 425294a94ecd7..f4a950c39bba2 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-2.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-2.png index 04d6559fdc389..7bf9f12bb80f4 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-2.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-2.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-3.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-3.png deleted file mode 100644 index bda30b22a99ae..0000000000000 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-3.png and /dev/null differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-4.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-4.png deleted file mode 100644 index 40cbc9b30353c..0000000000000 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/mag-practice-4.png and /dev/null differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/meta.json b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/meta.json index 96352aca78c62..db1daaf6f2217 100644 --- a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/meta.json @@ -16,12 +16,6 @@ { "name": "mag-practice-2" }, - { - "name": "mag-practice-3" - }, - { - "name": "mag-practice-4" - }, { "name": "practice" } diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/practice.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/practice.png index c4a4c391c899f..4493c934b09e4 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/practice.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Boxes/shotgun.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/base.png index 0fc45f32ca1cf..77efffd233212 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/beanbag.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/beanbag.png index 9b61bad972ea0..71b2afbde8044 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/beanbag.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/beanbag.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/mag-1.png index 06b50bc42d18c..b0493d5a5fcf5 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/pellets.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/pellets.png index 9b61bad972ea0..71b2afbde8044 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/pellets.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/pellets.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/slug.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/slug.png index 38336c0375dc2..4ea1a8de93b21 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/slug.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/drum.rsi/slug.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/base.png index 9b61bad972ea0..71b2afbde8044 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/beanbag.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/beanbag.png index 9b61bad972ea0..71b2afbde8044 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/beanbag.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/beanbag.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/mag-1.png index 31dd3e72a0015..7da0488b1cca8 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/pellets.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/pellets.png index 9b61bad972ea0..71b2afbde8044 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/pellets.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/pellets.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/slug.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/slug.png index f6dd341812140..c137f66d8cca2 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/slug.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Sinabir/mag.rsi/slug.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/base.png index c98083a0bfc95..217199175eee5 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-1.png index 54bf062641e2b..61c7a4aa034f1 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-2.png new file mode 100644 index 0000000000000..4ceac48ff8bbc Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-3.png new file mode 100644 index 0000000000000..09e4bfbfda83c Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-4.png new file mode 100644 index 0000000000000..dc45f78a3237e Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/meta.json b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/meta.json index a974ab33436a5..d08f76d60b7d4 100644 --- a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), base resprited by thezuti", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -16,6 +16,15 @@ { "name": "mag-1" }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, { "name": "inhand-left-mag", "directions": 4 @@ -31,6 +40,9 @@ { "name": "inhand-right-stripe", "directions": 4 - } + }, + { + "name": "practice" + } ] } diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/practice.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/practice.png new file mode 100644 index 0000000000000..686bc2d36c792 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/stripe.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/stripe.png index 779465c927295..2f126e09bbe64 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/stripe.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/Tochmash/caseless_rifle_mag_burn.rsi/stripe.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base-spent.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base-spent.png index c49547f287b7f..fb4f0ec3178ce 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base-spent.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base-spent.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base.png index f50c38f7f279c..ac6de6c6fc002 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/BSAA/weapons/shell.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/base.png index 337434ff45b51..2c5bbc9cf960a 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/mag-1.png index 983693db04107..2798da4f3ea62 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/ash12/ash12-mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/base.png index c8a0bdeee3843..1c8da1a394b9f 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/icon.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/icon.png index e3d66d87ee086..ec2a91e192936 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/icon.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/icon.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/mag-1.png index 6b84bef9e4367..5d790395e0263 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/red.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/red.png index 32f36edc7071f..1c8da1a394b9f 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/red.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/asval/mag.rsi/red.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/base.png index 2656d31c1cf24..35db70fd3375f 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-1.png index 147284077d984..ed227544fee9a 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-2.png index a71a4f09d40d7..38362e2651ca4 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-3.png index dbe6fa3cb6fa1..1c60ff37fa523 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-3.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-4.png index 59a68c42ae72e..e392689d14e14 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-4.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-5.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-5.png deleted file mode 100644 index 4792b796df87e..0000000000000 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-5.png and /dev/null differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-6.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-6.png deleted file mode 100644 index 66ef44d856cca..0000000000000 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-6.png and /dev/null differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-7.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-7.png deleted file mode 100644 index 5c97cb5da0a7d..0000000000000 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/mag-7.png and /dev/null differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/meta.json b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/meta.json index e2feab81c61b6..1c6263524ca1c 100644 --- a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/rpl20/rpl20-drum.rsi/meta.json @@ -22,15 +22,6 @@ { "name": "mag-4" }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - }, - { - "name": "mag-7" - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/base.png index 1201ca6519053..166cd3f9dfa28 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/mag-1.png index e0f0cd5906920..e2dcbcebc1e8c 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/scarab/mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/base.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/base.png index 2356f56681e95..2b78b793f88ae 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/base.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/mag-1.png index 66d8206a7e068..aba135706fe9c 100644 Binary files a/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Necromorfs/TheCircle/Weapon/weapons/zastaba/zastaba-mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png index 1685543539f94..da43224474478 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png index c9f029f32a3f3..89cfd6baf59bd 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png index 84725cfd32184..8a341c9f2d146 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png index 532baa546b3c5..dd4e88c3facfe 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..141bf08a57661 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json index 86be905b0711f..fc9dd1e802715 100644 --- a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, { "name": "practice" } diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png index 99548b3e5b42d..e5aad546f3f18 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png index ef44262042f0e..4961236df596d 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png index 907b6040c276f..661844b8a54c4 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png index 36c872a426860..c4765c84563e1 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png index 025bec650e008..0c4d2fe83ee09 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png index 31c1c6b5c7629..38ec8f83252e8 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..eb25c732e9033 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json index ecacb0c9849d5..80e3b6fe7f45c 100644 --- a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, { "name": "incendiary" }, diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png index b252261c160cd..4caebdd822383 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png index 7fefe0c6b9f7f..329ad597b88aa 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png index ac7de8b43bd0a..32334fe6582fc 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png index 226711c301a27..4c18562b2cfd6 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png index 1d8de97957ef2..acac9bb4026b7 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png index 43d1f0f5f71c5..8a7c7c179c70c 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png index 5d6d61f5dbfb5..16d9567fed8c8 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png new file mode 100644 index 0000000000000..cd15998943f30 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json index 78ae58bec5551..6056dba3c1b08 100644 --- a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -16,6 +16,9 @@ { "name": "mag-2" }, + { + "name": "mag-3" + }, { "name": "incendiarydisplay" }, diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png index 6911805ffae20..65ac07461249e 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png index 1dba694fefb2d..84fcf8c1547ee 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png index 6db2100a88ae0..734a727b2b2e3 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png index e10d99713b599..f75a7b3d8b62d 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png index 4d7eb62cbf22a..43d00be9f21c5 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png index 24cf3a37fb93b..b0c555c0cd9cc 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png index 68bb5da7bed97..53442f758a394 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png new file mode 100644 index 0000000000000..c62ff1e32a517 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png new file mode 100644 index 0000000000000..487af3d586560 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-5.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index aa62458ca6a69..700cf4af48826 100644 --- a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github), resprited by dakone22 (github) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -22,6 +22,12 @@ { "name": "mag-3" }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, { "name": "mag-big-1" }, diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png index 6d5337b8bffef..149cb2ffbf7a5 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png index 8dede3071ea2d..8c4cd351ca3d6 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/base.png index 62d442954438b..7815108e22238 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/incendiary.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/incendiary.png new file mode 100644 index 0000000000000..51a3917bd38ea Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/incendiary.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/mag-1.png index 7d212e1f9a86c..105c03b18f2b8 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/meta.json index 519ab2bdccd8f..da49171dc7022 100644 --- a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос", + "copyright": "Made by inspector_jeleshka (discord) for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "size": { "x": 32, "y": 32 @@ -21,6 +21,9 @@ }, { "name": "mag-1" - } + }, + { + "name": "incendiary" + } ] } diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/practice.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/practice.png index a290c3930286b..fcc7537c02b32 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/practice.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/practice.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/red.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/red.png index c211a819f8634..7815108e22238 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/red.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/red.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/uranium.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/uranium.png index 833f21ca46cb4..b466976b18b4f 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/uranium.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Carbines/sks_scope.rsi/uranium.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png index 4c1b28eba2308..ce9d97fe1df5f 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png index 1e3e43b7f40d4..3c748f21f9c9d 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-2.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-2.png new file mode 100644 index 0000000000000..2a1066a576bcd Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-2.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-3.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-3.png new file mode 100644 index 0000000000000..5e58b2ede2e2e Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-3.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-4.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-4.png new file mode 100644 index 0000000000000..7655b3e6f4227 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-4.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-5.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-5.png new file mode 100644 index 0000000000000..ddf7d80635fcb Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-5.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-6.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-6.png new file mode 100644 index 0000000000000..770a9b4385ef4 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/mag-6.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json index 54d3ce7a350e6..83d27fdb91e8e 100644 --- a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "From #mally0352 for Space Station 14 server Мёртвый Космос", + "copyright": "From #mally0352 for Space Station 14 server Мёртвый Космос, resprite by sastr. (discord) for Space Station 14 server Мёртвый Космос", "states": [ { "name": "base" @@ -15,6 +15,21 @@ }, { "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" } ] } diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png index f901da8c72a3a..6f2967e91eb95 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/magazinedeserteagle.rsi/red.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/base.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/base.png index 662754c2afe40..2405be96e440f 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/base.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o1.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o1.png index 37649c51be53c..7248084bab148 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o1.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o1.png differ diff --git a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o2.png b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o2.png index 6b5a3f2dd03d1..d279b5d664fb3 100644 Binary files a/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o2.png and b/Resources/Textures/_DeadSpace/Objects/Weapons/Guns/Ammunition/Magazine/energycartridge.rsi/o2.png differ diff --git a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/base.png b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/base.png index c8a0bdeee3843..1c8da1a394b9f 100644 Binary files a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/base.png and b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/base.png differ diff --git a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/icon.png b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/icon.png index e3d66d87ee086..ec2a91e192936 100644 Binary files a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/icon.png and b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/icon.png differ diff --git a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/mag-1.png b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/mag-1.png index 6b84bef9e4367..5d790395e0263 100644 Binary files a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/mag-1.png and b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/mag-1.png differ diff --git a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/red.png b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/red.png index 32f36edc7071f..1c8da1a394b9f 100644 Binary files a/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/red.png and b/Resources/Textures/_DeadSpace/Soyuz/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/asval.rsi/red.png differ