From fabc97d733d02667f693c064a6cf86ec42a4a632 Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Tue, 16 Mar 2021 08:14:11 +0000
Subject: [PATCH] Fixes SMG mag issues (#3683)

* SMG crate correct mags

* Map Hotfixing
---
 Resources/Maps/saltern.yml                    | 22 +++++++++----------
 .../Catalog/Fills/Crates/armory.yml           | 12 +++++-----
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index d680532398..2286ee531a 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -14137,10 +14137,9 @@ entities:
     parent: 853
     type: Transform
 - uid: 1152
-  type: LockerMedical
+  type: LockerMedicalFilled
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 22.5,-7.5
+  - pos: 22.5,-7.5
     parent: 853
     type: Transform
   - IsPlaceable: False
@@ -14157,10 +14156,9 @@ entities:
     parent: 853
     type: Transform
 - uid: 1154
-  type: LockerMedical
+  type: LockerMedicalFilled
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 21.5,-7.5
+  - pos: 21.5,-7.5
     parent: 853
     type: Transform
   - IsPlaceable: False
@@ -46063,9 +46061,9 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4726
-  type: MagazinePistolSmgRubber
+  type: MagazineMagnumSmgRubber
   components:
-  - pos: -14.7352915,20.360342
+  - pos: -14.7353,20.40566
     parent: 853
     type: Transform
   - canCollide: False
@@ -46075,9 +46073,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4727
-  type: MagazinePistolSmgRubber
+  type: MagazineMagnumSmgRubber
   components:
-  - pos: -14.457996,20.344717
+  - pos: -14.536245,20.421286
     parent: 853
     type: Transform
   - canCollide: False
@@ -46087,9 +46085,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4728
-  type: MagazinePistolSmgRubber
+  type: MagazineMagnumSmgRubber
   components:
-  - pos: -14.239246,20.360342
+  - pos: -14.33312,20.40566
     parent: 853
     type: Transform
   - canCollide: False
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index 278a129e24..466b4a30ed 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -2,24 +2,24 @@
   id: CrateArmorySMG
   name: smg crate
   parent: CrateWeaponSecure
-  description: "Contains three high-powered, semiautomatic rifles with six mags. Requires Armory access to open."
+  description: "Contains two high-powered, semiautomatic rifles with six mags. Requires Armory access to open."
   components:
   - type: StorageFill
     contents:
       - name: SmgDrozd
-        amount: 3
-      - name: MagazineMagnum
-        amount: 6
+        amount: 2
+      - name: MagazineMagnumSmg
+        amount: 4
 
 - type: entity
   id: CrateArmoryShotgun
   name: shotgun crate
   parent: CrateWeaponSecure
-  description: "For when the enemy absolutely needs to be replaced with lead. Contains three Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
+  description: "For when the enemy absolutely needs to be replaced with lead. Contains two Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open."
   components:
   - type: StorageFill
     contents:
       - name: ShotgunGladstone
-        amount: 3
+        amount: 2
       - name: ShellShotgun
         amount: 18