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>

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -109,101 +109,94 @@
       - id: ClothingMaskGas
 
 - type: entity
+  parent: GunSafe
   id: GunSafeDisabler
-  suffix: Disabler
+  name: disabler safe
-  parent: GunSafe
-  name: gun safe disabler
   components:
   - type: StorageFill
     contents:
-      - id: WeaponDisabler
+    - id: WeaponDisabler
-        amount: 5
+      amount: 5
 
 - type: entity
+  parent: GunSafe
   id: GunSafePistolMk58
-  suffix: MK58
+  name: mk58 safe
-  parent: GunSafe
-  name: gun safe Mk58
   components:
   - type: StorageFill
     contents:
-      - id: WeaponPistolMk58
+    - id: WeaponPistolMk58
-        amount: 4
+      amount: 4
-      - id: MagazinePistol
+    - id: MagazinePistol
-        amount: 8
+      amount: 8
 
 - type: entity
+  parent: GunSafe
   id: GunSafeRifleLecter
-  suffix: Lecter
+  name: lecter safe
-  parent: GunSafe
-  name: gun safe lecter
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRifleLecter
+    - id: WeaponRifleLecter
-        amount: 2
+      amount: 2
-      - id: MagazineRifle
+    - id: MagazineRifle
-        amount: 4
+      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
+    - id: WeaponSubMachineGunDrozd
-        amount: 2
+      amount: 2
-      - id: MagazineMagnumSubMachineGun
+    - id: MagazinePistolSubMachineGun
-        amount: 4
+      amount: 4
 
 - type: entity
+  parent: GunSafe
   id: GunSafeShotgunEnforcer
-  suffix: Enforcer
+  name: enforcer safe
-  parent: GunSafe
-  name: gun safe enforcer
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunEnforcer
+    - id: WeaponShotgunEnforcer
-        amount: 2
+      amount: 2
-      - id: MagazineShotgun
+    - id: MagazineShotgun
-        amount: 4
+      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
+    - id: WeaponShotgunKammerer
-        amount: 2
+      amount: 2
-      - id: MagazineShotgun
+    - id: MagazineShotgun
-        amount: 4
+      amount: 4
 
 - type: entity
   id: GunSafeSubMachineGunWt550
   suffix: Wt550
   parent: GunSafe
-  name: gun safe Wt550
+  name: wt550 safe
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunWt550
+    - id: WeaponSubMachineGunWt550
-        amount: 2
+      amount: 2
-      - id: MagazinePistolSubMachineGun
+    - id: MagazinePistolSubMachineGun
-        amount: 4
+      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
+    - id: WeaponLaserCarbine
-        amount: 3
+      amount: 3

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

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