From aa09f7114700e7b9d52f307a9bc362775193ca2a Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:23:03 -0600
Subject: [PATCH 01/44] Buff rifle ammo

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 3e1d49ddc02..e2b4d2067a8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 17
+        Piercing: 23
 
 - type: entity
   id: BulletRiflePractice
@@ -53,5 +53,5 @@
     damage:
       types:
         Radiation: 7
-        Piercing: 8
+        Piercing: 12
         

From ea30da239c45d771cc286a6d20db42fa64b5567b Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:26:24 -0600
Subject: [PATCH 02/44] Update antimateriel.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Weapons/Guns/Ammunition/Projectiles/antimateriel.yml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
index 70f0a053959..29f9fd5873b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -7,8 +7,8 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 50 # DeltaV - Damage Bumped, was 40
-        Structural: 200 # DeltaV - was 30
-    ignoreResistances: true # DeltaV - Hristov be spooky now
+        Piercing: 70 #AntiMateriel Sniper should hurt real bad
+        Structural: 400 #Sniper is rarely used this way, but this ammo type exists to burst down CONCRETE and TANKS 
+    ignoreResistances: true
   - type: StaminaDamageOnCollide
-    damage: 50 # DeltaV - was 35
+    damage: 75 #Getting hit with this should knock you the fuck down

From 0523adc499f2b478639ef73ac0d6b82df1ccd5c5 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:28:10 -0600
Subject: [PATCH 03/44] Update shotgun.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index d8c465cf9e8..4c3568dc058 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -144,13 +144,13 @@
   - type: SolutionContainerManager
     solutions:
       ammo:
-        maxVol: 15
+        maxVol: 30
   - type: RefillableSolution
     solution: ammo
   - type: DrainableSolution
     solution: ammo
   - type: SolutionInjectOnProjectileHit
-    transferAmount: 15
+    transferAmount: 30 #"Hey, you're not meant to have a shotgun its gree- *snores*"
     solution: ammo
   - type: InjectableSolution
     solution: ammo

From 3abf5b0b8973236846c3819f172e1ef54030e6c9 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:34:45 -0600
Subject: [PATCH 04/44] SMG Buffs (Drozd meta must end)

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/SMGs/smgs.yml        | 148 +++++++++---------
 1 file changed, 75 insertions(+), 73 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 621d2a88ec1..65365cc67a8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -122,6 +122,7 @@
   - type: Gun
     minAngle: 21
     maxAngle: 32
+    fireRate: 10
     shotsPerBurst: 5
     availableModes:
     - SemiAuto
@@ -201,53 +202,54 @@
       zeroVisible: true
     - type: Appearance
 
-- type: entity
-  name: Vector
-  parent: BaseWeaponSubMachineGun
-  id: WeaponSubMachineGunVector
-  suffix: Deprecated use Drozd
-  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
-    layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-      - state: mag-0
-        map: ["enum.GunVisualLayers.Mag"]
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
-  - type: Gun
-    fireRate: 6
-    selectedMode: FullAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
-    availableModes:
-    - FullAuto
-    fireOnDropChance: 0.1
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineMagnumSubMachineGun
-        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineMagnumSubMachineGun
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeMagnum
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeMagnum
-  - type: MagazineVisuals
-    magState: mag
-    steps: 1
-    zeroVisible: true
-  - type: Appearance
+#Commented out the Vector, as it is deprecated.
+#- type: entity
+#  name: Vector
+#  parent: BaseWeaponSubMachineGun
+#  id: WeaponSubMachineGunVector
+#  suffix: Deprecated use Drozd
+#  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
+#  components:
+#  - type: Sprite
+#    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
+#    layers:
+#      - state: base
+#        map: ["enum.GunVisualLayers.Base"]
+#      - state: mag-0
+#        map: ["enum.GunVisualLayers.Mag"]
+#  - type: Clothing
+#    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
+#  - type: Gun
+#    fireRate: 6
+#    selectedMode: FullAuto
+#    soundGunshot:
+#      path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+#    availableModes:
+#    - FullAuto
+#    fireOnDropChance: 0.1
+#  - type: ItemSlots
+#    slots:
+#      gun_magazine:
+#        name: Magazine
+#        startingItem: MagazineMagnumSubMachineGun
+#        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+#        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+#        priority: 2
+#       whitelist:
+#          tags:
+#            - MagazineMagnumSubMachineGun
+#      gun_chamber:
+#        name: Chamber
+#        startingItem: CartridgeMagnum
+#        priority: 1
+#        whitelist:
+#          tags:
+#            - CartridgeMagnum
+#  - type: MagazineVisuals
+#    magState: mag
+##    steps: 1
+#    zeroVisible: true
+#  - type: Appearance
 
 - type: entity
   name: WT550
@@ -273,7 +275,7 @@
   - type: ChamberMagazineAmmoProvider
     boltClosed: null
   - type: Gun
-    fireRate: 5.5
+    fireRate: 7
     minAngle: 1
     maxAngle: 6
     angleIncrease: 1.5
@@ -347,28 +349,28 @@
             tags:
               - CartridgePistol
 
-- type: entity
-  name: Vector
-  parent: WeaponSubMachineGunVector
-  id: WeaponSubMachineGunVectorRubber
-  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
-  suffix: Non-Lethal
-  components:
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineMagnumSubMachineGunRubber
-        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
-        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineMagnumSubMachineGun
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeMagnumRubber
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeMagnum
\ No newline at end of file
+#- type: entity
+#  name: Vector
+#  parent: WeaponSubMachineGunVector
+#  id: WeaponSubMachineGunVectorRubber
+#  description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
+#  suffix: Non-Lethal
+#  components:
+#  - type: ItemSlots
+#    slots:
+#      gun_magazine:
+#        name: Magazine
+#        startingItem: MagazineMagnumSubMachineGunRubber
+#        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+#        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+#        priority: 2
+#        whitelist:
+#          tags:
+#            - MagazineMagnumSubMachineGun
+#      gun_chamber:
+#        name: Chamber
+#        startingItem: CartridgeMagnumRubber
+#        priority: 1
+#        whitelist:
+#          tags:
+#            - CartridgeMagnum

From 22651d1f67b3fdcc3ddf52f4d085a1e0291269b2 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:40:37 -0600
Subject: [PATCH 05/44] Minigun stuff

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index cb557e05974..4e2d1f62e41 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -49,8 +49,12 @@
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
+  - type: GunWieldBonus
+      minAngle: -22
+      maxAngle: -30
   - type: Gun
-    fireRate: 15
+      minAngle: 30
+      maxAngle: 60
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: BallisticAmmoProvider

From a8c604b1146f8fac0c81fc31552f605d9af0f718 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:06:59 -0600
Subject: [PATCH 06/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 4e2d1f62e41..bc2395d9141 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -6,6 +6,7 @@
   abstract: true
   components:
   - type: Sprite
+  - type: Wieldable
   - type: Item
     size: Ginormous
   - type: Gun

From 09a9629cd8175daf14f6338ebff75ec89ec235d2 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:14:01 -0600
Subject: [PATCH 07/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index bc2395d9141..41c625acbb6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -50,14 +50,14 @@
       map: ["enum.GunVisualLayers.Base"]
   - type: Item
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
-  - type: GunWieldBonus
-      minAngle: -22
-      maxAngle: -30
   - type: Gun
       minAngle: 30
       maxAngle: 60
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
+  - type: GunWieldBonus
+      minAngle: -22
+      maxAngle: -30
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000

From d2cf6329a47c9487ae058f4c3d064dc3c796d30b Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:34:43 -0600
Subject: [PATCH 08/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/HMGs/hmgs.yml           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 41c625acbb6..974568e19bc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -51,13 +51,13 @@
   - type: Item
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
   - type: Gun
-      minAngle: 30
-      maxAngle: 60
+    minAngle: 30
+    maxAngle: 60
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: GunWieldBonus
-      minAngle: -22
-      maxAngle: -30
+    minAngle: -22
+    maxAngle: -30
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000

From c8a2009ab63fff5afa5f4c8be05a3b819e45f1ac Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:37:47 -0600
Subject: [PATCH 09/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/HMGs/hmgs.yml           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 974568e19bc..af0b5e89cf6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -51,13 +51,13 @@
   - type: Item
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
   - type: Gun
-    minAngle: 30
-    maxAngle: 60
+    minAngle: 60
+    maxAngle: 90
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: GunWieldBonus
-    minAngle: -22
-    maxAngle: -30
+    minAngle: -40
+    maxAngle: -40
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000

From 1f7a1d79515552490dd1015ba64a3ec3256cb3fe Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:41:08 -0600
Subject: [PATCH 10/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/HMGs/hmgs.yml           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index af0b5e89cf6..025fa6e6ac9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -51,13 +51,13 @@
   - type: Item
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
   - type: Gun
-    minAngle: 60
-    maxAngle: 90
+    minAngle: 80
+    maxAngle: 140
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: GunWieldBonus
-    minAngle: -40
-    maxAngle: -40
+    minAngle: -70
+    maxAngle: -90
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000

From ad88492742d1f0a0b362b0387b0cada7bc0a9fdb Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:43:04 -0600
Subject: [PATCH 11/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 025fa6e6ac9..9faecf9c26b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -52,12 +52,12 @@
     sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
   - type: Gun
     minAngle: 80
-    maxAngle: 140
+    maxAngle: 200
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: GunWieldBonus
     minAngle: -70
-    maxAngle: -90
+    maxAngle: -155
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000

From 388b0c427a66fe68232688763ae15554d9ce15ae Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:47:48 -0600
Subject: [PATCH 12/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 9faecf9c26b..24c293ba900 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -61,6 +61,10 @@
   - type: BallisticAmmoProvider
     proto: CartridgeMinigun
     capacity: 1000
+  - type: ClothingSpeedModifier
+    walkModifier: 0.4
+    sprintModifier: 0.4
+  - type: HeldSpeedModifier
   - type: MagazineVisuals
     magState: mag
     steps: 4

From 0cb3db29648b94a58033315fa9af574ada0eb89e Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 15:53:28 -0600
Subject: [PATCH 13/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index d37555c3443..385748c7ce6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -18,4 +18,4 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 5
+        Piercing: 10

From 22af51108fd5126c0e99db976d55fc39b12e9570 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:03:27 -0600
Subject: [PATCH 14/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index 385748c7ce6..96dc9d0f159 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -15,6 +15,8 @@
   parent: BulletHeavyRifle
   categories: [ HideSpawnMenu ]
   components:
+  - type: CartridgeAmmo
+    deleteOnSpawn: True
   - type: Projectile
     damage:
       types:

From c5c6914d3a1bf18af2ff1b6cc1d3d62cb025880b Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:03:49 -0600
Subject: [PATCH 15/44] Update rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Weapons/Guns/Ammunition/Boxes/rifle.yml   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index fef44fe33bb..88ff2ffa1d2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -139,3 +139,23 @@
       map: ["enum.GunVisualLayers.Mag"]
     - state: uranium
 
+- type: entity
+  parent: BaseMagazineBoxRifle
+  id: MagazineBoxRifleMinigun
+  name: ammunition box (.10 rifle)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 2000
+    proto: BulletMinigun
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: practice-b
+  - type: MagazineVisuals
+    magState: magb
+    steps: 2
+    zeroVisible: false
+  - type: Appearance

From e15e2c256e244a77ecb21a056d072d5b8e8b394f Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:10:30 -0600
Subject: [PATCH 16/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index 96dc9d0f159..385748c7ce6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -15,8 +15,6 @@
   parent: BulletHeavyRifle
   categories: [ HideSpawnMenu ]
   components:
-  - type: CartridgeAmmo
-    deleteOnSpawn: True
   - type: Projectile
     damage:
       types:

From c00becb7a7110d503fb3a8d22238ebdb12b7bb81 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:13:08 -0600
Subject: [PATCH 17/44] Update rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 88ff2ffa1d2..3c385bd72dc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -146,7 +146,7 @@
   components:
   - type: BallisticAmmoProvider
     capacity: 2000
-    proto: BulletMinigun
+    proto: CartridgeMinigun
   - type: Sprite
     layers:
     - state: base-b

From 216af3105f657c48b4c5340d0f3943ce96a15509 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:16:34 -0600
Subject: [PATCH 18/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 24c293ba900..017f9072d42 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -58,9 +58,17 @@
   - type: GunWieldBonus
     minAngle: -70
     maxAngle: -155
-  - type: BallisticAmmoProvider
-    proto: CartridgeMinigun
-    capacity: 1000
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineBoxRifleMinigun
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineBoxRifleMinigun
   - type: ClothingSpeedModifier
     walkModifier: 0.4
     sprintModifier: 0.4

From a20769f329e480c4e96e3e3a72555516659beb8e Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:16:53 -0600
Subject: [PATCH 19/44] Update rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 3c385bd72dc..5d4948050d7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -145,7 +145,7 @@
   name: ammunition box (.10 rifle)
   components:
   - type: BallisticAmmoProvider
-    capacity: 2000
+    capacity: 500
     proto: CartridgeMinigun
   - type: Sprite
     layers:

From 7021c23270ffdf18f37c4582625e9ac54cfb0ea8 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:20:11 -0600
Subject: [PATCH 20/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 017f9072d42..93d08e945d1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -80,5 +80,4 @@
   - type: Appearance
   - type: ContainerContainer
     containers:
-      ballistic-ammo: !type:Container
-        ents: []
+      gun_magazine: !type:ContainerSlot

From 7f5a13f71306ca908d910c0ae449646c95b70112 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:25:01 -0600
Subject: [PATCH 21/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/HMGs/hmgs.yml        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 93d08e945d1..f1cdfdfbb13 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -58,6 +58,10 @@
   - type: GunWieldBonus
     minAngle: -70
     maxAngle: -155
+  - type: ChamberMagazineAmmoProvider
+    soundRack:
+      path: /Audio/Weapons/Guns/Cock/lmg_cock.ogg
+  - type: AmmoCounter
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -69,6 +73,17 @@
         whitelist:
           tags:
             - MagazineBoxRifleMinigun
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeMinigun
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeMinigun
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
   - type: ClothingSpeedModifier
     walkModifier: 0.4
     sprintModifier: 0.4
@@ -77,7 +92,3 @@
     magState: mag
     steps: 4
     zeroVisible: true
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot

From 46d2d187e398a2073bfea95ebba0c6f6bda73a4a Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:31:19 -0600
Subject: [PATCH 22/44] Update rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 5d4948050d7..667af38ac63 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -144,6 +144,9 @@
   id: MagazineBoxRifleMinigun
   name: ammunition box (.10 rifle)
   components:
+  - type: Tag
+    tags:
+      - MagazineBoxRifleMinigun
   - type: BallisticAmmoProvider
     capacity: 500
     proto: CartridgeMinigun

From ef0ae08a1fc926982f6c43b0558157b94a618161 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:36:52 -0600
Subject: [PATCH 23/44] Update rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Weapons/Guns/Ammunition/Boxes/rifle.yml   | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 667af38ac63..911c79a4cbb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -138,27 +138,3 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: uranium
-
-- type: entity
-  parent: BaseMagazineBoxRifle
-  id: MagazineBoxRifleMinigun
-  name: ammunition box (.10 rifle)
-  components:
-  - type: Tag
-    tags:
-      - MagazineBoxRifleMinigun
-  - type: BallisticAmmoProvider
-    capacity: 500
-    proto: CartridgeMinigun
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: practice-b
-  - type: MagazineVisuals
-    magState: magb
-    steps: 2
-    zeroVisible: false
-  - type: Appearance

From fca0c55917b132dabd697132027f7d0370ac3e72 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:37:28 -0600
Subject: [PATCH 24/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Guns/Ammunition/Magazines/heavy_rifle.yml | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index d8af7064a4a..93e644a1631 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -26,3 +26,23 @@
     steps: 2
     zeroVisible: false
   - type: Appearance
+
+- type: entity
+  id: MagazineBoxRifleMinigun
+  name: "Minigun Ammo Box (.10 rifle)"
+  parent: BaseMagazineHeavyRifle
+  components:
+  - type: Tag
+    tags:
+      - MagazineBoxRifleMinigun
+  - type: BallisticAmmoProvider
+    proto: CartridgeMinigun
+    capacity: 500
+  - type: Item
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 8
+    zeroVisible: false
+  - type: Appearance

From e64ab0696fbaea3be059a0732629267c77047209 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:40:02 -0600
Subject: [PATCH 25/44] Update tags.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Prototypes/tags.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index b4c9888746b..98acea80bc6 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -890,6 +890,9 @@
 - type: Tag
   id: MagazineHeavyRifleBox
 
+- type: Tag
+  id: MagazineBoxRifleMinigun
+
 - type: Tag
   id: MagazineLightRifle
 

From 21441ce4f8e2ad33136abfbc71f58b7c40b28b50 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:43:14 -0600
Subject: [PATCH 26/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index f1cdfdfbb13..592a920b1fd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -7,6 +7,7 @@
   components:
   - type: Sprite
   - type: Wieldable
+    unwieldOnUse: false
   - type: Item
     size: Ginormous
   - type: Gun

From 37649b1786150167e3c4b5ce32eaede0891b9521 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:44:36 -0600
Subject: [PATCH 27/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 592a920b1fd..6fc272edd44 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -86,8 +86,8 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: ClothingSpeedModifier
-    walkModifier: 0.4
-    sprintModifier: 0.4
+    walkModifier: 0.3
+    sprintModifier: 0.3
   - type: HeldSpeedModifier
   - type: MagazineVisuals
     magState: mag

From b5ff789ab1d7c43d62fa59461601ec2463b3e289 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:45:16 -0600
Subject: [PATCH 28/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>

From 8dd4b720319ec56aef1b7c3a67f23e32d3b4e84a Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:06:14 -0600
Subject: [PATCH 29/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index 93e644a1631..8981fdc7fe4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -5,7 +5,7 @@
   abstract: true
   components:
   - type: Tag
-    tags:
+      tags:
       - MagazineHeavyRifle
   - type: Item
     size: Small

From 9dfd70e115e8139729c5f16b21fb6c551ec906da Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:06:51 -0600
Subject: [PATCH 30/44] Update smgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 65365cc67a8..91a7338967a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -203,7 +203,7 @@
     - type: Appearance
 
 #Commented out the Vector, as it is deprecated.
-#- type: entity
+# - type: entity
 #  name: Vector
 #  parent: BaseWeaponSubMachineGun
 #  id: WeaponSubMachineGunVector

From 6dd26b03ded957ed5db2ff050574b2f8284b05d5 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:07:45 -0600
Subject: [PATCH 31/44] Update antimateriel.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Weapons/Guns/Ammunition/Projectiles/antimateriel.yml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
index 29f9fd5873b..740ed90e344 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -7,8 +7,8 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 70 #AntiMateriel Sniper should hurt real bad
-        Structural: 400 #Sniper is rarely used this way, but this ammo type exists to burst down CONCRETE and TANKS 
+        Piercing: 70 # AntiMateriel Sniper should hurt real bad
+        Structural: 400 # Sniper is rarely used this way, but this ammo type exists to burst down CONCRETE and TANKS 
     ignoreResistances: true
   - type: StaminaDamageOnCollide
-    damage: 75 #Getting hit with this should knock you the fuck down
+    damage: 75 # Getting hit with this should knock you the fuck down

From 6dbbd4c1dbd75441eb41518c989acfbf21907568 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:09:05 -0600
Subject: [PATCH 32/44] Update shotgun.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 4c3568dc058..ecca4433cdb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -150,7 +150,7 @@
   - type: DrainableSolution
     solution: ammo
   - type: SolutionInjectOnProjectileHit
-    transferAmount: 30 #"Hey, you're not meant to have a shotgun its gree- *snores*"
+    transferAmount: 30 # "Hey, you're not meant to have a shotgun its gree- *snores*"
     solution: ammo
   - type: InjectableSolution
     solution: ammo

From 2232ad860f45afc3ab649832a93d151a75c19f47 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:24:44 -0600
Subject: [PATCH 33/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index 8981fdc7fe4..93e644a1631 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -5,7 +5,7 @@
   abstract: true
   components:
   - type: Tag
-      tags:
+    tags:
       - MagazineHeavyRifle
   - type: Item
     size: Small

From 60c658a7b4680d1cbf9c3d9cb223311ade72fac0 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:35:17 -0600
Subject: [PATCH 34/44] Update migration.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Migrations/migration.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index b9d1996d9d5..eb6cd897841 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -312,6 +312,10 @@ ImprovisedExplosive: FireBomb
 ImprovisedExplosiveEmpty: FireBombEmpty
 ImprovisedExplosiveFuel: FireBombFuel
 
+# 2025-03-2
+WeaponSubMachineGunVectorRubber: null
+WeaponSubMachineGunVector: null
+
 # Lavaland EE stuff
 TreasureDatadiskEncrypted: null
 VendingMachineBoozeSyndicate: VendingMachineBooze

From a03c45f8cb2c71a6e1bd949b30ea562b4ea58a8f Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:38:53 -0600
Subject: [PATCH 35/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 6fc272edd44..229b2df1e32 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -76,11 +76,11 @@
             - MagazineBoxRifleMinigun
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeMinigun
+        startingItem: CartridgeHeavyRifle
         priority: 1
         whitelist:
           tags:
-            - CartridgeMinigun
+            - CartridgeHeavyRifle
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot

From 21aebf12cb62e0c05dd54c2ad6af70e076e5ea60 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:39:53 -0600
Subject: [PATCH 36/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 229b2df1e32..6fc272edd44 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -76,11 +76,11 @@
             - MagazineBoxRifleMinigun
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeHeavyRifle
+        startingItem: CartridgeMinigun
         priority: 1
         whitelist:
           tags:
-            - CartridgeHeavyRifle
+            - CartridgeMinigun
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot

From 7132fb624d6585d2008702d08a8aafc8414a5670 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:40:20 -0600
Subject: [PATCH 37/44] Update tags.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Prototypes/tags.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 98acea80bc6..bc8e33fa56d 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -358,6 +358,9 @@
 - type: Tag
   id: CartridgeHeavyRifle
 
+- type: Tag
+  id: CartridgeMinigun
+
 - type: Tag
   id: CartridgeLightRifle
 

From bda6be141ce39f34f5b040551af778082c00ef58 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:41:11 -0600
Subject: [PATCH 38/44] Update migration.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Migrations/migration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index eb6cd897841..f58967d236c 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -312,7 +312,7 @@ ImprovisedExplosive: FireBomb
 ImprovisedExplosiveEmpty: FireBombEmpty
 ImprovisedExplosiveFuel: FireBombFuel
 
-# 2025-03-2
+# 2025-03-02
 WeaponSubMachineGunVectorRubber: null
 WeaponSubMachineGunVector: null
 

From 029f75b27eeb37feb3ce9e725ca1d651efbc924a Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:52:14 -0600
Subject: [PATCH 39/44] Update security.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Catalog/Fills/Lockers/security.yml        | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/security.yml
index 6e0fb6ab527..eb1ddb48908 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/security.yml
@@ -1,11 +1,12 @@
-- type: entity
-  parent: GunSafe
-  id: GunSafeSubMachineGunVector
-  name: vector safe
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponSubMachineGunVector
-      amount: 2
-    - id: MagazineMagnumSubMachineGun
-      amount: 4
+# The vector is no more
+# - type: entity
+#  parent: GunSafe
+#  id: GunSafeSubMachineGunVector
+#  name: vector safe
+#  components:
+#  - type: StorageFill
+#    contents:
+#    - id: WeaponSubMachineGunVector
+#      amount: 2
+#    - id: MagazineMagnumSubMachineGun
+#      amount: 4

From 8c45b3aa7afba06bc14b95c00194967fbb21c5e3 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:53:08 -0600
Subject: [PATCH 40/44] Update suspicion_loot_table.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 Resources/Prototypes/LootTables/suspicion_loot_table.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
index c2b00488a8b..29d577b9303 100644
--- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml
+++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
@@ -68,9 +68,9 @@
   - id: WeaponSubMachineGunC20r
     amount: 0
     maxAmount: 5
-  - id: WeaponSubMachineGunVector
-    amount: 0
-    maxAmount: 5
+  # - id: WeaponSubMachineGunVector
+  #  amount: 0
+  #  maxAmount: 5
   - id: WeaponSubMachineGunWt550
     amount: 0
     maxAmount: 5

From 28b0403cd09c3ffe7f8db2213d8d67d43c33ec15 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:31:43 -0600
Subject: [PATCH 41/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Entities/Objects/Weapons/Guns/HMGs/hmgs.yml           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 6fc272edd44..93d6fb959be 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -57,8 +57,8 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
   - type: GunWieldBonus
-    minAngle: -70
-    maxAngle: -155
+    minAngle: -75
+    maxAngle: -175
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/lmg_cock.ogg
@@ -86,8 +86,8 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: ClothingSpeedModifier
-    walkModifier: 0.3
-    sprintModifier: 0.3
+    walkModifier: 0.4
+    sprintModifier: 0.4
   - type: HeldSpeedModifier
   - type: MagazineVisuals
     magState: mag

From a95ffe32686ae2eed7e1a1b3bed3a8ab3ce47e4e Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:31:57 -0600
Subject: [PATCH 42/44] Update hmgs.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 93d6fb959be..a72dbefddc1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -86,8 +86,8 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: ClothingSpeedModifier
-    walkModifier: 0.4
-    sprintModifier: 0.4
+    walkModifier: 0.35
+    sprintModifier: 0.35
   - type: HeldSpeedModifier
   - type: MagazineVisuals
     magState: mag

From b74d7d3d131609e92c76d7486e7749e987b8281e Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:32:19 -0600
Subject: [PATCH 43/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index 385748c7ce6..cb84f335b4d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -18,4 +18,4 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 10
+        Piercing: 15

From 2be6a993f35d38ee3ac2da38d084b41dfde5f446 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:56:24 -0600
Subject: [PATCH 44/44] Update heavy_rifle.yml

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index cb84f335b4d..8e5226548e0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -18,4 +18,4 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 15
+        Piercing: 12