From 0486778e44b9a52ec03c10de71f2a4bd9ca7007f Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Wed, 10 May 2023 21:33:23 +0000
Subject: [PATCH] gun safe tweaks (#16312)

* change gun safe access to armory

* tweak gun safe names, remove suffix, vector -> drozd

* migrate vector safe to drozd safe

* ci sus

* ci sussy

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Catalog/Fills/Lockers/security.yml        | 93 +++++++++----------
 .../Storage/Closets/Lockers/lockers.yml       |  2 +-
 Resources/migration.yml                       |  3 +-
 3 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index f3bd817926..07df29b5e1 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -109,101 +109,94 @@
       - id: ClothingMaskGas
 
 - type: entity
-  id: GunSafeDisabler
-  suffix: Disabler
   parent: GunSafe
-  name: gun safe disabler
+  id: GunSafeDisabler
+  name: disabler safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponDisabler
-        amount: 5
+    - id: WeaponDisabler
+      amount: 5
 
 - type: entity
-  id: GunSafePistolMk58
-  suffix: MK58
   parent: GunSafe
-  name: gun safe Mk58
+  id: GunSafePistolMk58
+  name: mk58 safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponPistolMk58
-        amount: 4
-      - id: MagazinePistol
-        amount: 8
+    - id: WeaponPistolMk58
+      amount: 4
+    - id: MagazinePistol
+      amount: 8
 
 - type: entity
-  id: GunSafeRifleLecter
-  suffix: Lecter
   parent: GunSafe
-  name: gun safe lecter
+  id: GunSafeRifleLecter
+  name: lecter safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRifleLecter
-        amount: 2
-      - id: MagazineRifle
-        amount: 4
+    - id: WeaponRifleLecter
+      amount: 2
+    - id: MagazineRifle
+      amount: 4
 
 - type: entity
-  id: GunSafeSubMachineGunVector
-  suffix: Vector
   parent: GunSafe
-  name: gun safe vector
+  id: GunSafeSubMachineGunDrozd
+  name: drozd safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunVector
-        amount: 2
-      - id: MagazineMagnumSubMachineGun
-        amount: 4
+    - id: WeaponSubMachineGunDrozd
+      amount: 2
+    - id: MagazinePistolSubMachineGun
+      amount: 4
 
 - type: entity
-  id: GunSafeShotgunEnforcer
-  suffix: Enforcer
   parent: GunSafe
-  name: gun safe enforcer
+  id: GunSafeShotgunEnforcer
+  name: enforcer safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunEnforcer
-        amount: 2
-      - id: MagazineShotgun
-        amount: 4
+    - id: WeaponShotgunEnforcer
+      amount: 2
+    - id: MagazineShotgun
+      amount: 4
 
 - type: entity
-  id: GunSafeShotgunKammerer
-  suffix: Kammerer
   parent: GunSafe
-  name: gun safe kammerer
+  id: GunSafeShotgunKammerer
+  name: kammerer safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunKammerer
-        amount: 2
-      - id: MagazineShotgun
-        amount: 4
+    - id: WeaponShotgunKammerer
+      amount: 2
+    - id: MagazineShotgun
+      amount: 4
 
 - type: entity
   id: GunSafeSubMachineGunWt550
   suffix: Wt550
   parent: GunSafe
-  name: gun safe Wt550
+  name: wt550 safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunWt550
-        amount: 2
-      - id: MagazinePistolSubMachineGun
-        amount: 4
+    - id: WeaponSubMachineGunWt550
+      amount: 2
+    - id: MagazinePistolSubMachineGun
+      amount: 4
 
 - type: entity
-  id: GunSafeLaserCarbine
-  suffix: Laser Carbine
   parent: GunSafe
-  name: gun safe laser carbine
+  id: GunSafeLaserCarbine
+  name: laser safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponLaserCarbine
-        amount: 3
+    - id: WeaponLaserCarbine
+      amount: 3
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index a7e1457975..bc6e056e25 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -364,7 +364,7 @@
       state_open: shotguncase_open
       state_closed: shotguncase_door
   - type: AccessReader
-    access: [["Security"]]
+    access: [["Armory"]]
 
 # Detective
 - type: entity
diff --git a/Resources/migration.yml b/Resources/migration.yml
index bc29c62bea..371f88aecf 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -48,6 +48,7 @@ MagazineBoxAntiMaterial: MagazineBoxAntiMateriel
 CartridgeAntiMaterial: CartridgeAntiMateriel
 BulletAntiMaterial: BulletAntiMateriel
 
-# 2023--05-10
+# 2023-05-10
 FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce
 FoodBakedCookieFortune: FoodSnackCookieFortune
+GunSafeSubMachineGunVector: GunSafeSubMachineGunDrozd
-- 
2.51.2