From 60559ad1c1e499a2c7e75fefad033a04f85e1029 Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Tue, 18 Apr 2023 01:31:40 +0300
Subject: [PATCH] [Fix] Gun safe, not a shotgun safe (#15495)

---
 .../Catalog/Fills/Lockers/security.yml        | 40 +++++++++++--------
 .../Storage/Closets/Lockers/lockers.yml       |  4 +-
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index c9c681f1b9..a4d26b6363 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -100,9 +100,10 @@
       - id: ClothingMaskGas
 
 - type: entity
-  id: ShotgunSafeDisabler
+  id: GunSafeDisabler
   suffix: Disabler
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe disabler
   components:
   - type: StorageFill
     contents:
@@ -110,9 +111,10 @@
         amount: 5
 
 - type: entity
-  id: ShotgunSafePistolMK58
+  id: GunSafePistolMk58
   suffix: MK58
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe Mk58
   components:
   - type: StorageFill
     contents:
@@ -122,9 +124,10 @@
         amount: 8
 
 - type: entity
-  id: ShotgunSafeRifleLecter
+  id: GunSafeRifleLecter
   suffix: Lecter
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe lecter
   components:
   - type: StorageFill
     contents:
@@ -134,9 +137,10 @@
         amount: 4
 
 - type: entity
-  id: ShotgunSafeSubMachineGunVector
+  id: GunSafeSubMachineGunVector
   suffix: Vector
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe vector
   components:
   - type: StorageFill
     contents:
@@ -146,9 +150,10 @@
         amount: 4
 
 - type: entity
-  id: ShotgunSafeShotgunEnforcer
+  id: GunSafeShotgunEnforcer
   suffix: Enforcer
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe enforcer
   components:
   - type: StorageFill
     contents:
@@ -158,9 +163,10 @@
         amount: 4
 
 - type: entity
-  id: ShotgunSafeShotgunKammerer
+  id: GunSafeShotgunKammerer
   suffix: Kammerer
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe kammerer
   components:
   - type: StorageFill
     contents:
@@ -170,9 +176,10 @@
         amount: 4
 
 - type: entity
-  id: ShotgunSafeSubMachineGunWt550
+  id: GunSafeSubMachineGunWt550
   suffix: Wt550
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe Wt550
   components:
   - type: StorageFill
     contents:
@@ -182,9 +189,10 @@
         amount: 4
 
 - type: entity
-  id: ShotgunSafeLaserCarbine
+  id: GunSafeLaserCarbine
   suffix: Laser Carbine
-  parent: ShotgunSafe
+  parent: GunSafe
+  name: gun safe laser carbine
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index da60004f20..b4a8db3996 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -322,9 +322,9 @@
     access: [["Security"]]
 
 - type: entity
-  id: ShotgunSafe
+  id: GunSafe
   parent: LockerBaseSecure
-  name: shotgun safe
+  name: gun safe
   components:
   - type: Appearance
     visuals:
-- 
2.51.2