diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7183ffec13..4dbe68fc2f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -801,7 +801,6 @@ id: WeaponEgun description: Egun components: - - type: WeaponModules - type: Sprite sprite: Objects/Weapons/Guns/Battery/egun.rsi layers: @@ -813,10 +812,6 @@ - state: mag-twomode2-4 map: ["enum.GunVisualLayers.TwoModeSecond"] shader: unshaded - - state: aim_module - visible: false - sprite: White/Objects/Weapons/modulesOnEGUN.rsi - map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/Battery/egun.rsi quickEquip: false @@ -847,16 +842,3 @@ size: Large shape: - 0, 0, 3, 1 - - type: ItemSlots - slots: - aim_module: - name: Aim Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - HolographicAimModule - - type: ContainerContainer - containers: - aim_module: !type:ContainerSlot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index b1f273976b..49a65828d6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -304,22 +304,12 @@ description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. components: - type: Sprite - sprite: White/Objects/Weapons/Guns/Pistols/N1984.rsi + sprite: Objects/Weapons/Guns/Pistols/N1984.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - state: barrel_module - visible: false - map: [ "enum.ModuleVisualState.BarrelModule" ] - - state: handguard_module - visible: false - map: [ "enum.ModuleVisualState.HandGuardModule" ] - - state: aim_module - visible: false - sprite: White/Objects/Weapons/modulesOnPistols.rsi - map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/Pistols/N1984.rsi - type: Gun @@ -332,7 +322,6 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg - - type: WeaponModules - type: ItemSlots slots: gun_magazine: @@ -340,7 +329,7 @@ startingItem: MagazineMagnum insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 4 + priority: 2 whitelist: tags: - MagazineMagnum @@ -351,41 +340,6 @@ whitelist: tags: - CartridgeMagnum - barrel_module: - name: Barrel Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseBarrelModule - handguard_module: - name: Handguard Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseHandGuardModule - aim_module: - name: Aim Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - HolographicAimModule - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - handguard_module: !type:ContainerSlot - barrel_module: !type:ContainerSlot - aim_module: !type:ContainerSlot - - type: PointLight - enabled: false - autoRot: true - - type: Appearance - type: entity name: N1984 @@ -400,7 +354,7 @@ startingItem: MagazineMagnumRubber insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 4 + priority: 2 whitelist: tags: - MagazineMagnum @@ -411,27 +365,3 @@ whitelist: tags: - CartridgeMagnum - barrel_module: - name: Barrel Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseBarrelModule - handguard_module: - name: Handguard Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseHandGuardModule - aim_module: - name: Aim Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - HolographicAimModule diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 011cb5cba2..29cb4859fd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -77,16 +77,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - state: barrel_module - visible: false - map: [ "enum.ModuleVisualState.BarrelModule" ] - - state: handguard_module - visible: false - map: [ "enum.ModuleVisualState.HandGuardModule" ] - - state: aim_module - visible: false - sprite: White/Objects/Weapons/modulesOnAtreides.rsi - map: [ "enum.ModuleVisualState.AimModule" ] - type: Item sprite: White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi - type: Clothing @@ -95,63 +85,10 @@ fireRate: 10 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg - - type: WeaponModules - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistolSubMachineGun - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 4 - whitelist: - tags: - - MagazinePistolSubMachineGun - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - barrel_module: - name: Barrel Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseBarrelModule - handguard_module: - name: Handguard Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseHandGuardModule - aim_module: - name: Aim Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - HolographicAimModule - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - handguard_module: !type:ContainerSlot - barrel_module: !type:ContainerSlot - aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 zeroVisible: true - - type: PointLight - enabled: false - autoRot: true - type: Appearance - type: entity @@ -317,24 +254,14 @@ description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. components: - type: Sprite - sprite: White/Objects/Weapons/Guns/SMG/vector.rsi + sprite: Objects/Weapons/Guns/SMGs/vector.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - state: barrel_module - visible: false - map: [ "enum.ModuleVisualState.BarrelModule" ] - - state: handguard_module - visible: false - map: [ "enum.ModuleVisualState.HandGuardModule" ] - - state: aim_module - visible: false - sprite: White/Objects/Weapons/modulesOnVector.rsi - map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing - sprite: White/Objects/Weapons/Guns/SMG/vector.rsi + sprite: Objects/Weapons/Guns/SMGs/vector.rsi - type: Gun fireRate: 6 selectedMode: FullAuto @@ -342,7 +269,6 @@ path: /Audio/Weapons/Guns/Gunshots/atreides.ogg availableModes: - FullAuto - - type: WeaponModules - type: ItemSlots slots: gun_magazine: @@ -350,7 +276,7 @@ startingItem: MagazineMagnumSubMachineGun insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 4 + priority: 2 whitelist: tags: - MagazineMagnumSubMachineGun @@ -361,44 +287,10 @@ whitelist: tags: - CartridgeMagnum - barrel_module: - name: Barrel Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseBarrelModule - handguard_module: - name: Handguard Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseHandGuardModule - aim_module: - name: Aim Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseAimModule - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - handguard_module: !type:ContainerSlot - barrel_module: !type:ContainerSlot - aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 zeroVisible: true - - type: PointLight - enabled: false - autoRot: true - type: Appearance - type: entity @@ -582,27 +474,3 @@ whitelist: tags: - CartridgeMagnum - barrel_module: - name: Barrel Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseBarrelModule - handguard_module: - name: Handguard Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseHandGuardModule - aim_module: - name: Aim Module - insertSound: /Audio/White/Gun/Modules/insertmodule.ogg - ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 3 - whitelist: - tags: - - BaseAimModule diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/accelerator.png deleted file mode 100644 index f45c81d3ab..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/accelerator.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/barrel_module.png deleted file mode 100644 index 13ccfdc47a..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/barrel_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png deleted file mode 100644 index 984060bd91..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png deleted file mode 100644 index 92f2c6e391..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png deleted file mode 100644 index ab0d0a822f..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index ab0d0a822f..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/flamehider.png deleted file mode 100644 index efe47d90cf..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/flamehider.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/handguard_module.png deleted file mode 100644 index 3163e2893d..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/handguard_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png deleted file mode 100644 index bbe6128065..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png deleted file mode 100644 index 73e6d63b9c..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png deleted file mode 100644 index 443e6d2587..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/laser.png deleted file mode 100644 index d9ff0a8bbb..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/laser.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/light.png deleted file mode 100644 index 2c31db0809..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/light.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png deleted file mode 100644 index c661c6dfdc..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/mag-0.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json deleted file mode 100644 index e41fede449..0000000000 --- a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by IProduceWidgets (github) to make the style of desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - }, - { - "name": "silencer" - }, - { - "name": "light" - }, - { - "name": "laser" - }, - { - "name": "flamehider" - }, - { - "name": "accelerator" - }, - { - "name": "barrel_module" - }, - { - "name": "handguard_module" - } - ] -} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/silencer.png deleted file mode 100644 index ef19ad0418..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/silencer.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png index 69f823cf07..473c0093a3 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/accelerator.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/barrel_module.png deleted file mode 100644 index 7a58e7f2ab..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/barrel_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png index 490a85fbf7..758a3d79fd 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/flamehider.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard.png deleted file mode 100644 index 874348cf0a..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard_module.png deleted file mode 100644 index 4d517cd1a5..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/handguard_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png index bbdd543ce8..b65146a1d5 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/laser.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png index 23f5c0db00..0cd0d589b4 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/light.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json index fe545b1afa..d34cbe58eb 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/meta.json @@ -21,24 +21,6 @@ }, { "name": "silencer" - }, - { - "name": "light" - }, - { - "name": "laser" - }, - { - "name": "flamehider" - }, - { - "name": "accelerator" - }, - { - "name": "barrel_module" - }, - { - "name": "handguard_module" } ] } diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png index 3ae3a5a172..ca93e943d6 100644 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png and b/Resources/Textures/White/Objects/Weapons/Guns/SMG/atreides-icons.rsi/silencer.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/accelerator.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/accelerator.png deleted file mode 100644 index f8ef5735fa..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/accelerator.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/barrel_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/barrel_module.png deleted file mode 100644 index 54e5ea46f4..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/barrel_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/base.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/base.png deleted file mode 100644 index 4545503c57..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/bolt-open.png deleted file mode 100644 index f616d25f87..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-BACKPACK.png deleted file mode 100644 index 061f8bdae9..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index 061f8bdae9..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/flamehider.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/flamehider.png deleted file mode 100644 index c7d6b65805..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/flamehider.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard.png deleted file mode 100644 index 3bcc8ccb33..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard_module.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard_module.png deleted file mode 100644 index 0ffe9c2c55..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/handguard_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/icon.png deleted file mode 100644 index f728a5df1d..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-left.png deleted file mode 100644 index 9dfe592de8..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-right.png deleted file mode 100644 index afb543219f..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/laser.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/laser.png deleted file mode 100644 index d50b3b769b..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/laser.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/light.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/light.png deleted file mode 100644 index b8e1156470..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/light.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/mag-0.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/mag-0.png deleted file mode 100644 index 6aafc02670..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/mag-0.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json deleted file mode 100644 index bbe6a5fee7..0000000000 --- a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified vgstation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372, backpack sprite by Peptide (copy of Atreides), backpack sling sprite edited by Boaz1111", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - }, - { - "name": "silencer" - }, - { - "name": "light" - }, - { - "name": "laser" - }, - { - "name": "flamehider" - }, - { - "name": "accelerator" - }, - { - "name": "barrel_module" - }, - { - "name": "handguard_module" - } - ] -} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/silencer.png b/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/silencer.png deleted file mode 100644 index d3af4ef783..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/silencer.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/aim_module.png deleted file mode 100644 index ca059f7921..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/aim_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/holographic.png deleted file mode 100644 index 07ae159cce..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/holographic.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json deleted file mode 100644 index 11b7fc66e7..0000000000 --- a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by Aviu", - "size": { - "x": 48, - "y": 32 - }, - "states": [ - { - "name": "holographic" - }, - { - "name": "telescopic" - }, - { - "name": "aim_module" - } - ] -} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/telescopic.png deleted file mode 100644 index 6c5b21537d..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/telescopic.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/aim_module.png deleted file mode 100644 index 9e85663501..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/aim_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/holographic.png deleted file mode 100644 index afa2829b8a..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/holographic.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json deleted file mode 100644 index 6fbb997439..0000000000 --- a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by Aviu", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "holographic" - }, - { - "name": "telescopic" - }, - { - "name": "aim_module" - } - ] -} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/telescopic.png deleted file mode 100644 index f7192dc131..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/telescopic.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/aim_module.png deleted file mode 100644 index ca4d3c7f38..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/aim_module.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/holographic.png b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/holographic.png deleted file mode 100644 index 9583bb157f..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/holographic.png and /dev/null differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json deleted file mode 100644 index 6fbb997439..0000000000 --- a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "made by Aviu", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "holographic" - }, - { - "name": "telescopic" - }, - { - "name": "aim_module" - } - ] -} diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/telescopic.png b/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/telescopic.png deleted file mode 100644 index b020496b5b..0000000000 Binary files a/Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/telescopic.png and /dev/null differ