Revert "больше"

This reverts commit 92cdac2c46.

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

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

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

Resources/Textures/White/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json

@@ -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"
-        }
-    ]
-}

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"
         }
     ]
 }

Resources/Textures/White/Objects/Weapons/Guns/SMG/vector.rsi/meta.json

@@ -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"
-        }
-    ]
-}

Resources/Textures/White/Objects/Weapons/modulesOnAtreides.rsi/meta.json

@@ -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"
-        }
-    ]
-}

Resources/Textures/White/Objects/Weapons/modulesOnEGUN.rsi/meta.json

@@ -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"
-        }
-    ]
-}

Resources/Textures/White/Objects/Weapons/modulesOnVector.rsi/meta.json

@@ -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"
-        }
-    ]
-}