diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 7f2bf0ab29..26c4a75c41 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -106,7 +106,7 @@ entities: grid: 0 type: Collidable - uid: 1 - type: LaserItem + type: LaserGun components: - parent: 0 pos: -1.47174,4.550247 @@ -121,7 +121,7 @@ entities: bounds: -0.25,-0.25,0.25,0.25 type: Collidable - uid: 2 - type: LaserItem + type: LaserGun components: - parent: 0 pos: -0.6748645,4.487747 @@ -3177,7 +3177,7 @@ entities: bounds: -0.25,-0.25,0.25,0.25 type: Collidable - uid: 269 - type: smg_c20r + type: SmgC20r components: - parent: 0 pos: -2.524035,7.579326 @@ -3201,7 +3201,7 @@ entities: - A10mmSMG type: BallisticMagazineWeapon - uid: 270 - type: smg_c20r + type: SmgC20r components: - parent: 0 pos: -1.94591,7.485576 diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml index 0b78d032a7..c3e211e95c 100644 --- a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml @@ -1,7 +1,7 @@ - type: entity name: BaseLMG parent: BaseItem - id: lmg_base + id: LmgBase description: A rooty tooty point and shooty. abstract: true components: @@ -24,17 +24,17 @@ - type: entity name: L6 - parent: lmg_base - id: lmg_l6 + parent: LmgBase + id: LmgL6 description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/LMGs/l6.rsi - state: l6-5 + state: l6-4 - type: Icon sprite: Objects/Guns/LMGs/l6.rsi - state: l6-5 + state: l6-4 - type: RangedWeapon spreadstddev: 30 automatic: true @@ -48,24 +48,24 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: l6 - steps: 6 + steps: 5 - type: Item Size: 24 sprite: Objects/Guns/LMGs/l6.rsi - type: entity name: PK - parent: lmg_base - id: lmg_pk + parent: LmgBase + id: LmgPk description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/LMGs/pk.rsi - state: pk-5 + state: pk-4 - type: Icon sprite: Objects/Guns/LMGs/pk.rsi - state: pk-5 + state: pk-4 - type: RangedWeapon spreadstddev: 10 automatic: true @@ -79,7 +79,7 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: pk - steps: 6 + steps: 5 - type: Item Size: 24 sprite: Objects/Guns/LMGs/pk.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml index 6da20a4e5c..0f2c3b6d84 100644 --- a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml +++ b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml @@ -1,7 +1,7 @@ - type: entity name: Retro Laser Gun parent: BaseItem - id: LaserItem + id: LaserGun description: A weapon using light amplified by the stimulated emission of radiation. Ancient inefficient model. components: - type: Sprite @@ -31,8 +31,8 @@ - type: entity name: Laser Cannon - parent: LaserItem - id: LCannon + parent: LaserGun + id: LaserCannon description: With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes! components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml index 32789e89b3..b6ab4d6943 100644 --- a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml @@ -1,7 +1,7 @@ - type: entity name: BasePistol parent: BaseItem - id: pistol_base + id: PistolBase description: A rooty tooty point and shooty. abstract: true components: @@ -20,8 +20,8 @@ - type: entity name: Clarissa - parent: pistol_base - id: pistol_clarissa + parent: PistolBase + id: PistolClarissa description: A rooty tooty point and shooty. components: - type: Sprite @@ -52,8 +52,8 @@ - type: entity name: Clarissa (Silenced) - parent: pistol_base - id: pistol_clarissa_s + parent: PistolBase + id: PistolClarissaS description: A rooty tooty point and shooty. components: - type: Sprite @@ -84,8 +84,8 @@ - type: entity name: Deagle - parent: pistol_base - id: pistol_deagle + parent: PistolBase + id: PistolDeagle description: A rooty tooty point and shooty. components: - type: Sprite @@ -120,8 +120,8 @@ - type: entity name: Deckard - parent: pistol_base - id: pistol_deckard + parent: PistolBase + id: PistolDeckard description: A rooty tooty point and shooty. components: - type: Sprite @@ -155,8 +155,8 @@ - type: entity name: Giskard - parent: pistol_base - id: pistol_giskard + parent: PistolBase + id: PistolGiskard description: A rooty tooty point and shooty. components: - type: Sprite @@ -187,8 +187,8 @@ - type: entity name: Giskard (Silenced) - parent: pistol_base - id: pistol_giskard_s + parent: PistolBase + id: PistolGiskardS description: A rooty tooty point and shooty. components: - type: Sprite @@ -219,8 +219,8 @@ - type: entity name: Gyro pistol - parent: pistol_base - id: pistol_gyro + parent: PistolBase + id: PistolGyro description: A rooty tooty point and shooty. components: - type: Sprite @@ -256,8 +256,8 @@ - type: entity name: IH machine pistol - parent: pistol_base - id: pistol_ihmp + parent: PistolBase + id: PistolIhmp description: A rooty tooty point and shooty. components: - type: Sprite @@ -290,8 +290,8 @@ - type: entity name: IH machine pistol (Silenced) - parent: pistol_base - id: pistol_ihmp_s + parent: PistolBase + id: PistolIhmpS description: Pewsh pewsh components: - type: Sprite @@ -324,8 +324,8 @@ - type: entity name: IH sidearm - parent: pistol_base - id: pistol_ihsidearm + parent: PistolBase + id: PistolIhSidearm description: A rooty tooty point and shooty. components: - type: Sprite @@ -357,8 +357,8 @@ - type: entity name: IH sidearm (Silenced) - parent: pistol_base - id: pistol_ihsidearm_s + parent: PistolBase + id: PistolIhSidearmS description: A rooty tooty point and shooty. components: - type: Sprite @@ -390,8 +390,8 @@ - type: entity name: Lamia - parent: pistol_base - id: pistol_lamia + parent: PistolBase + id: PistolLamia description: A rooty tooty point and shooty. components: - type: Sprite @@ -427,8 +427,8 @@ - type: entity name: Makarov - parent: pistol_base - id: pistol_makarov + parent: PistolBase + id: PistolMakarov description: A rooty tooty point and shooty. components: - type: Sprite @@ -459,8 +459,8 @@ - type: entity name: Makarov (Silenced) - parent: pistol_base - id: pistol_makarov_s + parent: PistolBase + id: PistolMakarovS description: A rooty tooty point and shooty. components: - type: Sprite @@ -491,8 +491,8 @@ - type: entity name: Mk 58 - parent: pistol_base - id: pistol_mk58 + parent: PistolBase + id: PistolMk58 description: A rooty tooty point and shooty. components: - type: Sprite @@ -523,8 +523,8 @@ - type: entity name: Mk 58 (Wood) - parent: pistol_base - id: pistol_mk58_w + parent: PistolBase + id: PistolMk58W description: A rooty tooty point and shooty. components: - type: Sprite @@ -555,8 +555,8 @@ - type: entity name: Olivaw civil - parent: pistol_base - id: pistol_olivawcivil + parent: PistolBase + id: PistolOlivawCivil description: A rooty tooty point and shooty. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml index 31e090e3a3..74d6c945cd 100644 --- a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -1,7 +1,7 @@ - type: entity name: BaseRifle parent: BaseItem - id: rifle_base + id: RifleBase description: A rooty tooty point and shooty. abstract: true components: @@ -19,17 +19,17 @@ - type: entity name: AK - parent: rifle_base - id: rifle_ak + parent: RifleBase + id: RifleAk description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/Rifles/ak.rsi - state: ak-1 + state: ak-0 - type: Icon sprite: Objects/Guns/Rifles/ak.rsi - state: ak-1 + state: ak-0 - type: Sound - type: RangedWeapon spreadstddev: 2 @@ -45,24 +45,24 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: ak - steps: 2 + steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/ak.rsi - type: entity name: Black AK - parent: rifle_base - id: rifle_blackak + parent: RifleBase + id: RifleBlackAk description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/Rifles/black-ak.rsi - state: black-ak-1 + state: black-ak-0 - type: Icon sprite: Objects/Guns/Rifles/black-ak.rsi - state: black-ak-1 + state: black-ak-0 - type: Sound - type: RangedWeapon spreadstddev: 2 @@ -78,15 +78,15 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: black-ak - steps: 2 + steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/black-AK.rsi - type: entity name: Carbine - parent: rifle_base - id: rifle_carbine + parent: RifleBase + id: RifleCarbine description: A rooty tooty point and shooty. components: - type: Sprite @@ -118,8 +118,8 @@ - type: entity name: Dallas - parent: rifle_base - id: rifle_dallas + parent: RifleBase + id: RifleDallas description: A rooty tooty point and shooty. components: - type: Sprite @@ -152,8 +152,8 @@ - type: entity name: IH heavy rifle - parent: rifle_base - id: rifle_ihheavy + parent: RifleBase + id: RifleIhHeavy description: A rooty tooty point and shooty. components: - type: Sprite @@ -186,8 +186,8 @@ - type: entity name: Sol-EOT - parent: rifle_base - id: rifle_sol_eot + parent: RifleBase + id: RifleSolEot description: A rooty tooty point and shooty. components: - type: Sprite @@ -221,8 +221,8 @@ - type: entity name: Sol-Para - parent: rifle_base - id: rifle_sol_para + parent: RifleBase + id: RifleSolPara description: A rooty tooty point and shooty. components: - type: Sprite @@ -256,17 +256,17 @@ - type: entity name: STS - parent: rifle_base - id: rifle_sts + parent: RifleBase + id: RifleSts description: A rooty tooty point and shooty. components: - type: Sprite netsync: false sprite: Objects/Guns/Rifles/sts.rsi - state: sts-1 + state: sts-0 - type: Icon sprite: Objects/Guns/Rifles/sts.rsi - state: sts-1 + state: sts-0 - type: RangedWeapon spreadstddev: 2 automatic: true @@ -281,7 +281,7 @@ visuals: - type: BallisticMagazineWeaponVisualizer2D base_state: sts - steps: 2 + steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/sts.rsi diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml index ca0f273daa..cfba9ac129 100644 --- a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml @@ -1,7 +1,7 @@ - type: entity name: BaseSMG parent: BaseItem - id: smg_base + id: SmgBase description: A rooty tooty point and shooty. abstract: true components: @@ -23,8 +23,8 @@ - type: entity name: C-20r Sub Machine Gun - parent: smg_base - id: smg_c20r + parent: SmgBase + id: SmgC20r description: A rooty tooty point and shooty. components: - type: Sprite @@ -54,8 +54,8 @@ - type: entity name: IH SMG - parent: smg_base - id: smg_ihsmg + parent: SmgBase + id: SmgIhSmg description: Pla-ket-ket-ket-ket components: - type: Sprite @@ -86,8 +86,8 @@ - type: entity name: IH SMG (Silenced) - parent: smg_base - id: smg_ihsmg_s + parent: SmgBase + id: SmgIhSmgS description: Pewsh pewsh components: - type: Sprite @@ -119,8 +119,8 @@ - type: entity name: Mac - parent: smg_base - id: smg_mac + parent: SmgBase + id: SmgMac description: Pla-ket-ket-ket-ket components: - type: Sprite @@ -151,8 +151,8 @@ - type: entity name: Saber - parent: smg_base - id: smg_saber + parent: SmgBase + id: SmgSaber description: A rooty tooty point and shooty. components: - type: Sprite @@ -183,8 +183,8 @@ - type: entity name: WT550 - parent: smg_base - id: smg_wt550 + parent: SmgBase + id: SmgWt550 description: A rooty tooty point and shooty. components: - type: Sprite diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png index c4979a921e..2ed78d7823 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png index 2ed78d7823..93a813859f 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png index 93a813859f..041dfc3ce2 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png index 041dfc3ce2..1309e4ab80 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png index 1309e4ab80..484a678c9e 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png deleted file mode 100644 index 484a678c9e..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json index 5f061a3821..afc4bc4bf4 100644 --- a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json @@ -7,15 +7,6 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", "states": [ - { - "name": "l6-5", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, { "name": "l6-4", "directions": 1, diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json index ce7c79f729..40d93884e8 100644 --- a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json @@ -52,15 +52,6 @@ ] ] }, - { - "name": "pk-5", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, { "name": "pk", "directions": 1, diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png index c5cc775277..28d858a66d 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png index 28d858a66d..b67be31fe1 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png index b67be31fe1..000ad1d308 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png index 000ad1d308..b73ea28783 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png index b73ea28783..61951f164c 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png deleted file mode 100644 index 61951f164c..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png deleted file mode 100644 index 263beda755..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png deleted file mode 100644 index b04dd7b896..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png index 0a2e483e6c..1bb1bcc76e 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png deleted file mode 100644 index 1bb1bcc76e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json index f6ca6d93d4..cfc00ed2c9 100644 --- a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json @@ -1 +1,55 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "ak", "directions": 1}, {"name": "ak-0", "directions": 1}, {"name": "ak-1", "directions": 1}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "ak", + "directions": 1 + }, + { + "name": "ak-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png index f32d56b9ac..2dd6de65fc 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png and b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png deleted file mode 100644 index 2dd6de65fc..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json index c4d6b6a1d4..78bd89589a 100644 --- a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json @@ -1 +1,55 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "black-ak", "directions": 1}, {"name": "black-ak-0", "directions": 1}, {"name": "black-ak-1", "directions": 1}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "black-ak", + "directions": 1 + }, + { + "name": "black-ak-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json index a1034d7db3..edd5e68dc4 100644 --- a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json @@ -1 +1,55 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "sts", "directions": 1}, {"name": "sts-0", "directions": 1}, {"name": "sts-1", "directions": 1}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "sts", + "directions": 1 + }, + { + "name": "sts-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png index 45c0790de3..8c5ff49faa 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png deleted file mode 100644 index 8c5ff49faa..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png and /dev/null differ