Рандомизация Оружейки Брига (#2766)

2025-08-14 14:24:48 +01:00 · 2025-08-14 14:24:48 +01:00 · 0ae382018c
commit 0ae382018c
parent 5cffb52b3f
22 changed files with 2808 additions and 658 deletions
--- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
@ -28,9 +28,6 @@ ent-GunSafeShotgunSPAS12 = safe
 ent-GunSafeEnergyGunPistolSecurity = safe
    .suffix = Energy Pistol «Judge»
    .desc = { ent-GunSafe.desc }
-ent-GunSafeCombineSmallArms = safe
-    .suffix = Energy Pistol/Glock22
-    .desc = { ent-GunSafe.desc }
 ent-GunSafeEnergyGun = safe
    .suffix = Tactical Energy guns
    .desc = { ent-GunSafe.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@ -1,5 +1,3 @@
-ent-BaseWeaponSMGSunrise = BaseWeaponSMGSunrise
-    .desc = A rooty tooty point and shooty.
 ent-WeaponSubMachineGunP90 = P-90
    .desc = { ent-BaseWeaponSubMachineGun.desc }
 ent-WeaponSubMachineGunMP38 = MP-38
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
@ -28,9 +28,6 @@ ent-GunSafeShotgunSPAS12 = сейф LAW-12
 ent-GunSafeEnergyGunPistolSecurity = сейф энергетических пистолетов "Судья"
    .suffix = Санрайз
    .desc = { ent-GunSafe.desc }
-ent-GunSafeCombineSmallArms = сейф вторичное вооружение
-    .suffix = Энергетический пистолет/Glock22
-    .desc = { ent-GunSafe.desc }
 ent-GunSafeEnergyGun = сейф Тактических энергетических пушек
    .suffix = Санрайз
    .desc = { ent-GunSafe.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@ -1,5 +1,3 @@
-ent-BaseWeaponSMGSunrise = пистолет-пулемёт
-    .desc = Компактный и мощный.
 ent-WeaponSubMachineGunP90 = P-90
    .desc = P-90 - это SMG стандартного выпуска EarthGov. Он известен своими компактными размерами и простотой использования в полевых условиях. Использует патрон калибра .35 авто.
 ent-WeaponSubMachineGunMP38 = MP-38
--- a/Resources/Maps/_Sunrise/Station/delta.yml
+++ b/Resources/Maps/_Sunrise/Station/delta.yml
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@ -80,7 +80,7 @@
      map: ["enum.GunVisualLayers.MagUnshaded"]
      shader: unshaded
  - type: Gun
-    fireRate: 2.25 #Sunrise-Edit
+    fireRate: 2
  - type: RevolverAmmoProvider
    capacity: 5
    chambers: [ True, True, True, True, True ]
@ -105,9 +105,6 @@
    sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
  - type: Item
    storedOffset: 0,-2
-  - type: Gun #Sunrise-Start
-    selectedMode: SemiAuto
-    fireRate: 2 #Sunrise-End
  - type: RevolverAmmoProvider
    capacity: 6
    chambers: [ True, True, True, True, True, True ]
@ -152,7 +149,7 @@
    storedOffset: 0,-2
  - type: Gun
    selectedMode: SemiAuto
-    fireRate: 2.25 #Sunrise-Edit
+    fireRate: 2
    availableModes:
    - SemiAuto
    soundGunshot:
@ -188,7 +185,7 @@
  - type: Item
    storedOffset: 1,-5
  - type: Gun
-    fireRate: 1.75 #Sunrise-Edit
+    fireRate: 1.25 #Sunrise-Edit
  - type: ContainerContainer
    containers:
      revolver-ammo: !type:Container
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@ -1,6 +1,6 @@
 - type: entity
  name: BaseWeaponRifle
-  parent: [BaseItem, BaseGunWieldable]
+  parent: [BaseItem, BaseGunWieldable, GunMedium]
  id: BaseWeaponRifle
  description: A rooty tooty point and shooty.
  abstract: true
@ -76,10 +76,6 @@
        knockback: 0.1
      Felinid:
        knockback: 0.1
-  - type: ClothingSpeedModifier
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: HeldSpeedModifier
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
    maxOffset: 4.5
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@ -1,6 +1,6 @@
 - type: entity
  name: BaseSMG
-  parent: BaseItem
+  parent: [BaseItem, GunLight]
  id: BaseWeaponSubMachineGun
  description: A rooty tooty point and shooty.
  abstract: true
@ -74,13 +74,6 @@
  - type: EmitSoundOnLand
    sound:
      collection: RiflesDrop
-  - type: SpeedModifiedOnWield
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
-  - type: HeldSpeedModifier
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
    maxOffset: 3
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@ -1,6 +1,6 @@
 - type: entity
  name: BaseWeaponShotgun
-  parent: BaseItem
+  parent: [BaseItem, GunMedium]
  id: BaseWeaponShotgunAny
  description: A rooty tooty point and shooty.
  abstract: true
@ -64,7 +64,7 @@
      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg

 - type: entity
-  parent: BaseWeaponShotgunAny
+  parent: [BaseWeaponShotgunAny, GunLight]
  id: BaseWeaponShotgunPump
  abstract: true
  components:
@ -85,7 +85,7 @@
 - type: entity
  name: Bulldog
  # Don't parent to BaseWeaponShotgun because it differs significantly
-  parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband]
+  parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband, GunLight]
  id: WeaponShotgunBulldog
  description: An automatic magazine-fed shotgun for close-quarters combat. Kicks like a mule on steroids. Uses .50 shotgun shells.
  components:
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@ -1,6 +1,6 @@
 - type: entity
  name: SP-91-RC
-  parent: [BaseWeaponSubMachineGun, BaseSecurityContraband]
+  parent: [WeaponSubMachineGunDrozdMk2, BaseSecurityContraband]
  id: WeaponSubMachineGunSP91RC
  description: Compact submachine gun designed for riot control.
  components:
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@ -1,6 +1,6 @@
 - type: entity
  name: riot shotgun
-  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband]
+  parent: [BaseWeaponShotgunPump, BaseGunWieldable, BaseSecurityContraband]
  id: WeaponShotgunRiot
  description: A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control.
  components:
@ -8,7 +8,6 @@
    sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot_inhands_64x.rsi
  - type: Gun
    spread: 20
-    pump: true
  - type: Sprite
    sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot.rsi
  - type: Clothing
@ -23,7 +22,7 @@

 - type: entity
  name: sawn-off riot shotgun
-  parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityContraband]
+  parent: [BaseWeaponShotgunPump, BaseGunWieldable, BaseSecurityContraband]
  id: WeaponShotgunRiotSawn
  description: Come with me if you want to live.
  components:
@ -36,7 +35,6 @@
    sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot_sawn_inhands_64x.rsi
  - type: Gun
    spread: 30
-    pump: true
  - type: GunRequiresWield
  - type: BallisticAmmoProvider
    capacity: 4
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
@ -1,5 +1,6 @@
+# Energy Guns
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
  id: GunSafeEnergyGunMini
  name: mini energy cannons safe
  suffix: SUNRISE
@ -10,7 +11,41 @@
      amount: 5

 - type: entity
-  parent: GunSafe
+  id: GunSafeEnergyGunPistolSecurity
+  parent: GunSafeBaseSecure
+  name: safe
+  suffix: Energy Pistol «Judge»
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponEnergyGunPistolSecurity
+      amount: 4
+
+- type: entity
+  id: GunSafeEnergyPistolDominator
+  parent: GunSafeBaseSecure
+  name: safe
+  suffix: Energy Pistol «Dominator»
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponDominator
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeEnergyGun
+  name: safe
+  suffix: Tactical Energy guns
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponEnergyGunTactical
+      amount: 2
+
+## Pistols and revolvers safes
+- type: entity
+  parent: GunSafeBaseSecure
  id: GunSafePistolG22
  name: safe
  suffix: Glock-22
@ -19,24 +54,67 @@
    contents:
    - id: WeaponPistolG22
      amount: 4
+    - id: MagazineGlock22
+      amount: 8
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafePistolM1984
+  name: safe
+  suffix: M1984
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolM1984
+      amount: 4
    - id: MagazinePistol
      amount: 8

 - type: entity
-  parent: GunSafe
-  id: GunSafeRifleM16A4
+  parent: GunSafeBaseSecure
+  id: GunSafeSnubRevolver
  name: safe
-  suffix: M16A4
+  suffix: Snub Revolver
  components:
  - type: StorageFill
    contents:
-    - id: WeaponRifleM16A4
-      amount: 2
-    - id: MagazineRifleSP
+    - id: WeaponRevolverSnubRevolver
+      amount: 4
+    - id: SpeedLoaderMagnumSP
+      amount: 6
+    - id: SpeedLoaderMagnumRubber
      amount: 4

 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafePistolVP78
+  name: safe
+  suffix: VP-78
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolVP78
+      amount: 4
+    - id: MagazineVP70
+      amount: 8
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafePistolACP14
+  name: safe
+  suffix: ACP-14
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolACP14
+      amount: 4
+    - id: MagazineACP14
+      amount: 8
+
+# Safes for SMGs
+
+- type: entity
+  parent: GunSafeBaseSecure
  id: GunSafeSubMachineGunVector
  name: safe
  suffix: Vector
@ -46,10 +124,10 @@
    - id: WeaponSubMachineGunNewVector
      amount: 2
    - id: MagazinePistolSubMachineGunSP
-      amount: 4
+      amount: 6

 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
  id: GunSafeSubMachineGunMP7
  name: safe
  suffix: MP7, SUNRISE
@ -62,7 +140,7 @@
      amount: 4

 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
  id: GunSafeSubMachineGunSkorpion
  name: safe
  suffix: Skorpion, SUNRISE
@ -70,12 +148,131 @@
  - type: StorageFill
    contents:
    - id: WeaponSubMachineGunSkorpion
-      amount: 4
+      amount: 3
    - id: MagazinePistolSubMachineGunSP
      amount: 6

 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunMP5
+  name: safe
+  suffix: MP5, SUNRISE
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunMP5
+      amount: 2
+    - id: MagazinePistolSubMachineGunSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunDrozdMk2
+  name: safe
+  suffix: Drozd Mk2, SUNRISE
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunDrozdMk2
+      amount: 2
+    - id: MagazinePistolSubMachineGunSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunSP91RC
+  name: safe
+  suffix: SP91RC, SUNRISE
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunSP91RC
+      amount: 2
+    - id: MagazinePistolSubMachineGunSP
+      amount: 4
+
+# Rifles safes
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleM16A4
+  name: safe
+  suffix: M16A4
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleM16A4
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleAKMU
+  name: safe
+  suffix: AKMU
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleAKMU
+      amount: 2
+    - id: MagazineLightRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleLecterMk2
+  name: safe
+  suffix: Lecter Mk2
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleLecterMk2
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleAR18
+  name: safe
+  suffix: AR-18
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleAR18
+      amount: 2
+    - id: MagazineRifleHeavySP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleFamas
+  name: safe
+  suffix: Famas
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleFamas
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeWeaponRifleG36
+  name: safe
+  suffix: G-36
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleG36
+      amount: 2
+    - id: MagazineRifleSP
+      amount: 4
+
+# Shotguns safes
+- type: entity
+  parent: GunSafeBaseSecure
  id: GunSafeShotgunTrenchgun4034
  name: safe
  suffix: Trenchgun 4034
@ -84,15 +281,36 @@
    contents:
    - id: WeaponShotgunTrenchgun4034
      amount: 2
-    - id: BoxLethalshot
-      amount: 1
+    - id: SpeedLoaderShellShotgun
+      amount: 4
    - id: BoxBeanbag
      amount: 1
    - id: BoxShotgunSlug
      amount: 1
+    - id: BoxShotgunFlare
+      amount: 1

 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafeShotgunRiot
+  name: safe
+  suffix: Shotgun Riot
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunRiot
+      amount: 2
+    - id: SpeedLoaderShellShotgun
+      amount: 4
+    - id: BoxBeanbag
+      amount: 1
+    - id: BoxShotgunSlug
+      amount: 1
+    - id: BoxShotgunFlare
+      amount: 1
+
+- type: entity
+  parent: GunSafeBaseSecure
  id: GunSafeShotgunSPAS12
  name: safe
  suffix: LAW-12
@ -101,44 +319,202 @@
    contents:
    - id: WeaponShotgunSPAS12
      amount: 2
-    - id: BoxLethalshot
-      amount: 1
+    - id: SpeedLoaderShellShotgun
+      amount: 4
    - id: BoxBeanbag
      amount: 1
    - id: BoxShotgunSlug
      amount: 1
+    - id: BoxShotgunFlare
+      amount: 1

 - type: entity
-  id: GunSafeEnergyGunPistolSecurity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
+  id: GunSafeShotgunCombat
  name: safe
-  suffix: Energy Pistol «Judge»
+  suffix: Shotgun Combat
  components:
  - type: StorageFill
    contents:
-    - id: WeaponEnergyGunPistolSecurity
-      amount: 4
-
- type: entity
-  id: GunSafeCombineSmallArms
-  parent: GunSafe
-  name: safe
-  suffix: Energy Pistol/Glock22
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponEnergyGunPistolSecurity
-      amount: 3
-    - id: GlockBox
-      amount: 3
-
- type: entity
-  parent: GunSafe
-  id: GunSafeEnergyGun
-  name: safe
-  suffix: Tactical Energy guns
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponEnergyGunTactical
+    - id: WeaponShotgunCombat
      amount: 2
+    - id: SpeedLoaderShellShotgun
+      amount: 4
+    - id: BoxBeanbag
+      amount: 1
+    - id: BoxShotgunSlug
+      amount: 1
+    - id: BoxShotgunFlare
+      amount: 1
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeDoubleBarreled
+  name: safe
+  description: According to the paperwork — state-of-the-art tactical shotguns. In reality — antique double-barrels.
+  suffix: Shotgun Double-Barreled
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunDoubleBarreled
+      amount: 4
+    - id: SpeedLoaderShellShotgun
+      amount: 4
+    - id: BoxBeanbag
+      amount: 1
+    - id: SpeedLoaderShotgunIncendiary
+      amount: 4
+    - id: BoxShotgunFlare
+      amount: 1
+
+# Small Arms Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeSmallArms
+  parent: MarkerBase
+  suffix: Spawner Safe Pistols
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: SmallArmsSafes
+
+- type: entityTable
+  id: SmallArmsSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 85
+      children:
+      - id: GunSafePistolMk58
+      - id: GunSafePistolG22
+      - id: GunSafeEnergyGunPistolSecurity
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - id: GunSafePistolACP14
+      - id: GunSafeEnergyPistolDominator
+      - id: GunSafePistolVP78
+      - id: GunSafeSnubRevolver
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: GunSafePistolM1984
+      - id: GunSafeSubMachineGunSkorpion
+
+# ShotGuns Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeShotguns
+  parent: MarkerBase
+  suffix: Spawner Safe ShotGuns
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: ShotgunSafes
+
+- type: entityTable
+  id: ShotgunSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 90
+      children:
+      - id: GunSafeShotgunTrenchgun4034
+      - id: GunSafeShotgunKammerer
+      - id: GunSafeShotgunRiot
+    - !type:GroupSelector
+      weight: 9
+      children:
+      - id: GunSafeShotgunSPAS12
+      - id: GunSafeShotgunEnforcer
+      - id: GunSafeShotgunCombat
+    - !type:GroupSelector
+      weight: 1
+      children:
+      - id: GunSafeDoubleBarreled
+
+# Rifle Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeRifle
+  parent: MarkerBase
+  suffix: Spawner Safe Rifle
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RifleSafes
+
+- type: entityTable
+  id: RifleSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 85
+      children:
+      - id: GunSafeRifleLecter
+      - id: GunSafeRifleM16A4
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - id: GunSafeRifleAKMU
+      - id: GunSafeRifleLecterMk2
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: GunSafeRifleAR18
+      - id: GunSafeRifleFamas
+      - id: GunSafeWeaponRifleG36
+
+# SMG Spawner
+- type: entity
+  name: Armory Safe Spawner
+  id: SpawnerSafeSMG
+  parent: MarkerBase
+  suffix: Spawner Safe SMG
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/closet.rsi
+          state: shotguncase
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: SMGSafes
+
+- type: entityTable
+  id: SMGSafes
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector
+      weight: 80
+      children:
+      - id: GunSafeSubMachineGunMP7
+      - id: GunSafeSubMachineGunMP5
+      - id: GunSafeSubMachineGunDrozd
+    - !type:GroupSelector
+      weight: 15
+      children:
+      - id: GunSafeSubMachineGunDrozdMk2
+      - id: GunSafeSubMachineGunVector
+      - id: GunSafeSubMachineGunWt550
+    - !type:GroupSelector
+      weight: 5
+      children:
+      - id: GunSafeRifleAR18
+      - id: WeaponSubMachineGunSkorpion
+
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
@ -61,7 +61,7 @@
  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
  id: ClothingOuterArmorSWAT
  name: SWAT armor
-  description: NT's unsuccessful attempt to create universal and inexpensive protection. It provides excellent protection against many types of damage, but it also slows down extremely much.
+  description: NT's unsuccessful attempt to create universal and expensive protection. It provides excellent protection against many types of damage, but it also slows down extremely much.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Armor/heavy.rsi
@ -76,7 +76,7 @@
      coefficients:
        Blunt: 0.55
        Slash: 0.55
-        Piercing: 0.50
+        Piercing: 0.3
        Heat: 0.6
        Radiation: 0.6
        Caustic: 0.6
@ -89,8 +89,8 @@
    heatingCoefficient: 0.5
    coolingCoefficient: 0.5
  - type: ClothingSpeedModifier
-    walkModifier: 0.75
-    sprintModifier: 0.75
+    walkModifier: 0.8
+    sprintModifier: 0.8
  - type: GroupExamine
  - type: ProtectedFromStepTriggers
    slots: WITHOUT_POCKET
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@ -56,6 +56,9 @@
      map: ["enum.GunVisualLayers.Base"]
  - type: Clothing
    sprite: _Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi
+    slots:
+    - Back
+    - suitStorage
  - type: Item
    size: Huge
    shape:
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@ -59,18 +59,6 @@
    containers:
      gun_magazine: !type:ContainerSlot
      gun_chamber: !type:ContainerSlot
-  # - type: MeleeWeapon
-  #   angle: 60
-  #   range: 1
-  #   damage:
-  #     types:
-  #       Blunt: 11
-  #       Structural: 4
-  #   bluntStaminaDamageFactor: 2.0
-  #   attackRate: 0.9
-  #   autoAttack: false
-  # - type: AltFireMelee
-  #   attackType: Heavy
  - type: StaticPrice
    price: 500
  - type: EmitSoundOnPickup
@ -160,7 +148,7 @@

 - type: entity
  name: AKM-U
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponRifleSunrise
  id: WeaponRifleAKMU
  components:
  - type: Sprite
@ -306,7 +294,7 @@
    angleIncrease: 1.65
    angleDecay: 18
    fireRate: 5.25
-    burstFireRate: 9
+    burstFireRate: 12
    selectedMode: Burst
    availableModes:
    - Burst
@ -772,7 +760,7 @@

 - type: entity
  name: Lecter Mk2
-  parent: WeaponRifleLecter
+  parent: [WeaponRifleLecter, GunLight]
  id: WeaponRifleLecterMk2
  description: A high end military grade assault rifle. Uses .20 rifle ammo.
  components:
@ -796,9 +784,6 @@
  - type: ChamberMagazineAmmoProvider
    autoEject: true
  - type: Appearance
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
  - type: EyeCursorOffset
    maxOffset: 5
    pvsIncrease: 0.55
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@ -1,45 +1,6 @@
- type: entity
-  name: BaseWeaponSMGSunrise
-  parent: BaseWeaponSubMachineGun
-  id: BaseWeaponSMGSunrise
-  description: A rooty tooty point and shooty.
-  abstract: true
-  components:
-  - type: Gun
-    minAngle: 7
-    maxAngle: 19
-    angleIncrease: 1
-    angleDecay: 0.5
-    fireRate: 5
-    useKey: true
-    selectedMode: FullAuto
-  # - type: MeleeWeapon
-  #   angle: 60
-  #   range: 1
-  #   damage:
-  #     types:
-  #       Blunt: 9
-  #       Structural: 4
-  #   bluntStaminaDamageFactor: 2.0
-  #   attackRate: 0.9
-  #   autoAttack: false
-  # - type: AltFireMelee
-  #   attackType: Heavy
-  - type: SpeedModifiedOnWield
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
-  - type: HeldSpeedModifier
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 3
-    pvsIncrease: 0.35
-
 - type: entity
  name: P-90
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSubMachineGunP90
  components:
  - type: Item
@ -106,7 +67,7 @@

 - type: entity
  name: MP-38
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSubMachineGunMP38
  components:
  - type: Sprite
@ -163,7 +124,7 @@

 - type: entity
  name: MP7
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSubMachineGunMP7
  components:
  - type: Sprite
@ -222,7 +183,7 @@

 - type: entity
  name: MP5
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSubMachineGunMP5
  components:
  - type: Sprite
@ -293,7 +254,7 @@

 - type: entity
  name: Scorpion VZ-61
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSubMachineGunSkorpion
  components:
  - type: Item
@ -354,7 +315,7 @@

 - type: entity
  name: New Vector
-  parent: BaseWeaponSMGSunrise
+  parent: WeaponSubMachineGunDrozd
  id: WeaponSubMachineGunNewVector
  components:
  - type: Sprite
@ -371,22 +332,8 @@
    shape:
    - 0,0,3,2
    sprite: _Sunrise/Objects/Weapons/Guns/SMGs/vector/tiny.rsi
-  - type: GunWieldBonus
-    minAngle: -3
-    maxAngle: -16
  - type: Gun
-    minAngle: 6
-    maxAngle: 30
-    angleIncrease: 2.5
-    angleDecay: 0.5
-    fireRate: 7
-    burstFireRate: 12
-    selectedMode: Burst
-    availableModes:
-    - Burst
-    - FullAuto
-    shotsPerBurst: 3
-    burstCooldown: 0.15
+    burstFireRate: 22
    soundGunshot:
      path: /Audio/_Sunrise/Weapons/Guns/SMGs/new_vector/vector_shot.ogg
  - type: ItemSlots
@ -419,7 +366,7 @@

 - type: entity
  name: PPSH-41
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSubMachineGunPPSH41
  components:
  - type: Sprite
@ -484,7 +431,7 @@

 - type: entity
  name: MS-42
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponAMS-42
  description: A more advanced version of Lecter.
  components:
@ -542,7 +489,7 @@

 - type: entity
  name: AJ-100
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponAJ100
  description: High-speed SMG, equipped with a universal connector for other types of pistol magazines.
  components:
@ -608,7 +555,7 @@

 - type: entity
  name: SIAR-52 SMG
-  parent: BaseWeaponSMGSunrise
+  parent: BaseWeaponSubMachineGun
  id: WeaponSIAR52
  description: A high rate of fire weapon, equipped with integrated silencer.
  components:
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@ -1,6 +1,6 @@
 - type: entity
  name: Spas-12
-  parent: [BaseWeaponShotgun, GunLight, GunMeleeMedium, BaseSecurityContraband]
+  parent: [BaseWeaponShotgun, GunMeleeMedium, BaseSecurityContraband]
  id: WeaponShotgunSPAS12
  components:
  - type: Sprite
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/base_guns.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/base_guns.yml
@ -6,11 +6,14 @@
  abstract: true
  components:
  - type: SpeedModifiedOnWield
-    walkModifier: 0.95
+    walkModifier: 1
    sprintModifier: 0.95
  - type: HeldSpeedModifier
-    walkModifier: 0.95
+    walkModifier: 1
    sprintModifier: 0.95
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 1
  - type: Item
    size: Small
  - type: UseDelay
@ -21,11 +24,14 @@
  abstract: true
  components:
  - type: SpeedModifiedOnWield
-    walkModifier: 0.9
+    walkModifier: 1
    sprintModifier: 0.9
  - type: HeldSpeedModifier
-    walkModifier: 0.9
+    walkModifier: 1
    sprintModifier: 0.9
+  - type: ClothingSpeedModifier
+    walkModifier: 0.98
+    sprintModifier: 0.98
  - type: Item
    size: Normal
  - type: UseDelay
@ -36,11 +42,14 @@
  abstract: true
  components:
  - type: SpeedModifiedOnWield
-    walkModifier: 0.85
+    walkModifier: 0.95
    sprintModifier: 0.85
  - type: HeldSpeedModifier
-    walkModifier: 0.85
+    walkModifier: 0.95
    sprintModifier: 0.85
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
  - type: Item
    size: Large
  - type: UseDelay
@ -51,11 +60,14 @@
  abstract: true
  components:
  - type: SpeedModifiedOnWield
-    walkModifier: 0.75
+    walkModifier: 0.85
    sprintModifier: 0.75
  - type: HeldSpeedModifier
-    walkModifier: 0.75
+    walkModifier: 0.85
    sprintModifier: 0.75
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
  - type: Item
    size: Ginormous
  - type: UseDelay
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/debug.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/debug.yml
@ -2,7 +2,8 @@
  id: DebugSecurityOfficerGear
  equipment:
    head: ClothingHeadHelmetBasic
-    outerClothing: ClothingOuterArmorBasicSlim
+    outerClothing: ClothingOuterVestArmorSec
+    shoes: ClothingShoesBootsJackSec

 - type: entity
  save: false
@ -16,8 +17,9 @@
 - type: startingGear
  id: DebugBulletProofGear
  equipment:
-    head: ClothingHeadHelmetBasic
+    head: ClothingHeadHelmetPubg
    outerClothing: ClothingOuterArmorBulletproof
+    shoes: ClothingShoesBootsJackSec

 - type: entity
  save: false
@ -48,6 +50,7 @@
  equipment:
    head: ClothingHeadHatSyndieMAA
    outerClothing: ClothingOuterVestWeb
+    shoes: ClothingUnderSocksCoder

 - type: entity
  save: false
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/equipped-SUITSTORAGE.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/equipped-SUITSTORAGE.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi/meta.json
@ -19,6 +19,10 @@
            "name": "equipped-BACKPACK",
            "directions": 4
        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
        {
            "name": "wielded-inhand-left",
            "directions": 4
@ -28,4 +32,4 @@
            "directions": 4
        }
    ]
-}
+}
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@ -815,6 +815,8 @@ GrenadeEMP: GrenadeEMPTimer
 GrenadeFlash: GrenadeFlashTimer
 GrenadeFrag: GrenadeFragTimer
 WeaponEnergyGunMini: WeaponMiniEnergyGun
+# Safes
+GunSafeCombineSmallArms: SpawnerSafeSmallArms
 # SL HITSCAN START
 BoxMagazineRifle: BoxMagazineRifleSP
 MagazineBoxLightRifle: MagazineBoxLightRifleSP