Small changes

new-frontiers-14 · Jan 2, 2024 · bc9bea1 · bc9bea1
1 parent be253e7
commit bc9bea1
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 106 deletions.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/gun_racks_base.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/gun_racks_base.yml
@@ -155,9 +155,7 @@
 - type: entity
   id: WeaponRackWallmountedBase
   parent: WeaponRackBase
-  name: gun rack
-  suffix: wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Wallmounted
   components:
   - type: WallMount
     arc: 360

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/melee_weaapon_racks_base.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/melee_weaapon_racks_base.yml
@@ -101,9 +101,7 @@
 - type: entity
   id: WeaponRackMeleeWallmountedBase
   parent: WeaponRackMeleeBase
-  name: melee weapon rack
-  suffix: wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Wallmounted
   components:
   - type: WallMount
     arc: 360

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/pistol_racks_base.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/pistol_racks_base.yml
@@ -156,9 +156,7 @@
 - type: entity
   id: WeaponRackPistolWallmountedBase
   parent: WeaponRackPistolBase
-  name: pistol rack
-  suffix: wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Wallmounted
   components:
   - type: WallMount
     arc: 360

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_captain.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_captain.yml
@@ -2,9 +2,7 @@
 - type: entity
   id: WeaponRackCaptain
   parent: WeaponRackBase
-  name: gun rack
   suffix: Captain
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi
@@ -23,12 +21,8 @@
 - type: entity
   id: WeaponRackWallmountedCaptain
   parent: WeaponRackWallmountedBase
-  name: gun rack
-  suffix: Captain, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Captain, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi
@@ -68,12 +62,8 @@
 - type: entity
   id: WeaponRackMeleeWallmountedCaptain
   parent: WeaponRackMeleeWallmountedBase
-  name: melee weapon rack
-  suffix: Captain, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Captain, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi
@@ -92,9 +82,7 @@
 - type: entity
   id: WeaponRackPistolBaseCaptain
   parent: WeaponRackPistolBase
-  name: pistol rack
   suffix: Captain
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi
@@ -113,12 +101,8 @@
 - type: entity
   id: WeaponRackPistolWallmountedCaptain
   parent: WeaponRackPistolWallmountedBase
-  name: pistol rack
-  suffix: Captain, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Captain, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi
@@ -132,4 +116,4 @@
   - type: AccessReader
     access: [["Captain"]]
   - type: Lock
-    locked: true
+    locked: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_mercenary.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_mercenary.yml
@@ -2,9 +2,7 @@
 - type: entity
   id: WeaponRackMercenary
   parent: WeaponRackBase
-  name: gun rack
   suffix: Mercenary
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi
@@ -16,19 +14,15 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Mercenary"], ["Captain"]]
+    access: [["Captain"], ["Mercenary"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackWallmountedMercenary
   parent: WeaponRackWallmountedBase
-  name: gun rack
-  suffix: Mercenary, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Mercenary, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi
@@ -40,16 +34,14 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Mercenary"], ["Captain"]]
+    access: [["Captain"], ["Mercenary"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackMeleeMercenary
   parent: WeaponRackMeleeBase
-  name: melee weapon rack
   suffix: Mercenary
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi
@@ -61,19 +53,15 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Mercenary"], ["Captain"]]
+    access: [["Captain"], ["Mercenary"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackMeleeWallmountedMercenary
   parent: WeaponRackMeleeWallmountedBase
-  name: melee weapon rack
-  suffix: Mercenary, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Mercenary, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi
@@ -85,16 +73,14 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Mercenary"], ["Captain"]]
+    access: [["Captain"], ["Mercenary"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackPistolBaseMercenary
   parent: WeaponRackPistolBase
-  name: pistol rack
   suffix: Mercenary
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi
@@ -106,19 +92,15 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Mercenary"], ["Captain"]]
+    access: [["Captain"], ["Mercenary"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackPistolWallmountedMercenary
   parent: WeaponRackPistolWallmountedBase
-  name: pistol rack
-  suffix: Mercenary, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Mercenary, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi
@@ -130,6 +112,6 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Mercenary"], ["Captain"]]
+    access: [["Captain"], ["Mercenary"]]
   - type: Lock
-    locked: true
+    locked: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_salvage.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_salvage.yml
@@ -2,9 +2,7 @@
 - type: entity
   id: WeaponRackSalvage
   parent: WeaponRackBase
-  name: gun rack
   suffix: Salvage
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi
@@ -16,19 +14,15 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Salvage"]]
+    access: [["Captain"], ["Salvage"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackWallmountedSalvage
   parent: WeaponRackWallmountedBase
-  name: gun rack
-  suffix: Salvage, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Salvage, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi
@@ -40,16 +34,14 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Salvage"]]
+    access: [["Captain"], ["Salvage"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackMeleeSalvage
   parent: WeaponRackMeleeBase
-  name: melee weapon rack
   suffix: Salvage
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi
@@ -61,19 +53,15 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Salvage"]]
+    access: [["Captain"], ["Salvage"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackMeleeWallmountedSalvage
   parent: WeaponRackMeleeWallmountedBase
-  name: melee weapon rack
-  suffix: Salvage, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Salvage, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi
@@ -85,16 +73,14 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Salvage"]]
+    access: [["Captain"], ["Salvage"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackPistolBaseSalvage
   parent: WeaponRackPistolBase
-  name: pistol rack
   suffix: Salvage
-  description: A storage unit for expedited pacification measures.
   components:
   - type: Sprite
     sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi
@@ -106,19 +92,15 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Salvage"]]
+    access: [["Captain"], ["Salvage"]]
   - type: Lock
     locked: true
 
 - type: entity
   id: WeaponRackPistolWallmountedSalvage
   parent: WeaponRackPistolWallmountedBase
-  name: pistol rack
-  suffix: Salvage, wallmounted
-  description: A storage unit for expedited pacification measures.
+  suffix: Salvage, Wallmounted
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi
@@ -130,6 +112,6 @@
     - state: unlocked
       map: [ unlocked ]
   - type: AccessReader
-    access: [["Salvage"]]
+    access: [["Captain"], ["Salvage"]]
   - type: Lock
     locked: true