[Fix] Huinya

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

@@ -192,7 +192,7 @@
     contents:
     - id: WeaponPistolACP14
       amount: 4
-    - id: MagazinePistol
+    - id: MagazinePistol9x17
       amount: 8
 
 - type: entity

Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml

@@ -1,17 +1,36 @@
 - type: vendingMachineInventory
   id: AmmoVendInventory
   startingInventory:
-    MagazineBoxCaselessRifle: 6
-    MagazineBoxCaselessRiflePractice: 3
+  #  MagazineBoxCaselessRifle: 6
+  #  MagazineBoxCaselessRiflePractice: 3
 
-    MagazineBoxLightRifleBig: 6
-    MagazineBoxLightRiflePractice: 3
+  #  MagazineBoxLightRifleBig: 6
+  #  MagazineBoxLightRiflePractice: 3
 
     MagazineBoxMagnum: 6
     MagazineBoxMagnumPractice: 3
 
-    MagazineBoxPistol: 6
-    MagazineBoxPistolPractice: 3
+  #  MagazineBoxPistol: 6
+  #  MagazineBoxPistolPractice: 3
+
+  #  MagazineBoxRifle: 6
+  #  MagazineBoxRiflePractice: 3
+
+    MagazinePacketHeavyRifle50BMG: 6
+
+    MagazinePacketPistolACP: 6
+
+    MagazinePacketPistol50AE: 6
+
+    MagazinePacketPistol57x28: 6
+
+    MagazinePacketRifle556UEG: 6
+
+    MagazinePacketRifle762UEG: 6
+
+    MagazinePacketRifle762x39: 6
+
+    MagazineBoxRifleLightSniper: 6
+
+    MagazinePacketPistol9x17: 6
 
-    MagazineBoxRifle: 6
-    MagazineBoxRiflePractice: 3

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -462,28 +462,28 @@
 
 # Ammo
 
-- type: listing
-  id: UplinkPistol9mmMagazine
-  name: uplink-pistol-magazine-name
-  description: uplink-pistol-magazine-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
-  productEntity: MagazinePistol9x17 #backmen-ammonation
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkAmmo
+#- type: listing
+#  id: UplinkPistol9mmMagazine
+#  name: uplink-pistol-magazine-name
+#  description: uplink-pistol-magazine-desc
+#  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
+#  productEntity: MagazinePistol9x17 #backmen-ammonation
+#  cost:
+#    Telecrystal: 1
+#  categories:
+#  - UplinkAmmo
 
 # For the C20R
-- type: listing
-  id: UplinkMagazinePistolSubMachineGun
-  name: uplink-pistol-magazine-c20r-name
-  description: uplink-pistol-magazine-c20r-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon }
-  productEntity: MagazinePistolSubMachineGun9x17 #backmen-ammonation
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkAmmo
+#- type: listing
+#  id: UplinkMagazinePistolSubMachineGun
+#  name: uplink-pistol-magazine-c20r-name
+#  description: uplink-pistol-magazine-c20r-desc
+#  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon }
+#  productEntity: MagazinePistolSubMachineGun9x17 #backmen-ammonation
+#  cost:
+#    Telecrystal: 2
+#  categories:
+#  - UplinkAmmo
 
 # For the Cobra
 - type: listing
@@ -510,26 +510,26 @@
   - UplinkAmmo
 
 # For the mosin
-- type: listing
-  id: UplinkMosinAmmo
-  name: uplink-mosin-ammo-name
-  description: uplink-mosin-ammo-desc
-  productEntity: MagazineBoxHeavyRifle762 #backmen-ammonation
-  cost:
-    Telecrystal: 4 #backmen-ammonation
-  categories:
-  - UplinkAmmo
+#- type: listing
+#  id: UplinkMosinAmmo
+#  name: uplink-mosin-ammo-name
+#  description: uplink-mosin-ammo-desc
+#  productEntity: MagazineBoxHeavyRifle762 #backmen-ammonation
+#  cost:
+#    Telecrystal: 4 #backmen-ammonation
+#  categories:
+#  - UplinkAmmo
 
 # for the hristov
-- type: listing
-  id: UplinkHristovAmmo
-  name: uplink-sniper-ammo-name
-  description: uplink-sniper-ammo-desc
-  productEntity: MagazinePacketHeavyRifle50BMG #backmen-ammonation
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkAmmo
+#- type: listing
+#  id: UplinkHristovAmmo
+#  name: uplink-sniper-ammo-name
+#  description: uplink-sniper-ammo-desc
+#  productEntity: MagazinePacketHeavyRifle50BMG #backmen-ammonation
+#  cost:
+#    Telecrystal: 2
+#  categories:
+#  - UplinkAmmo
 
 - type: listing
   id: UplinkAmmoBundle

Resources/Prototypes/Research/arsenal.yml

@@ -25,20 +25,28 @@
   cost: 10000
   recipeUnlocks:
   - BoxShotgunIncendiary
-  - MagazineRifleIncendiary
-  - MagazinePistolIncendiary
-  - MagazinePistolSubMachineGunIncendiary
-  - MagazineLightRifleIncendiary
+#  - MagazineRifleIncendiary
+#  - MagazinePistolIncendiary
+#  - MagazinePistolSubMachineGunIncendiary
+#  - MagazineLightRifleIncendiary
+  - MagazinePacketPistolACPIncendiary
+  - MagazinePacketPistol9x17Incendiary
+  - MagazinePacketRifle762x39Incendiary
+  - MagazinePacketRifle556UEGIncendiary
+  - MagazinePacketRifle762UEGIncendiary
+  - MagazinePacketPistol57x28Incendiary
   - MagazineRifle762UEGIncendiary
   - MagazineRifleFamas556UEGIncendiary
+  - MagazineRifle556UEGIncendiary
   - MagazinePistol45ACPincendiary
   - MagazinePistol57x28Incendiary
+  - MagazinePistol9x17Incendiary
   - SpeedLoaderMagnumIncendiary
   - MagazineShotgunIncendiary
-  - MagazineBoxPistolIncendiary
+#  - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
-  - MagazineBoxLightRifleIncendiary
-  - MagazineBoxRifleIncendiary
+#  - MagazineBoxLightRifleIncendiary
+#  - MagazineBoxRifleIncendiary
 
 - type: technology
   id: WeaponizedLaserManipulation

Resources/Prototypes/_Backmen/Catalog/Fills/Items/Belts/belts.yml

@@ -37,6 +37,7 @@
           amount: 2
         - id: MagazineShotgun
           amount: 4
+        - id: ExGrenade
 
 - type: entity
   categories: [ HideSpawnMenu ]
@@ -49,10 +50,10 @@
       - 0,0,3,3
     - type: StorageFill
       contents:
-        - id: SheetSteel
-          amount: 2
-        - id: SheetRGlass
-        - id: MagazinePistol
+        - id: C4
+          amount: 4
+        - id: RCD
+        - id: RCDAmmo
           amount: 2
 
 - type: entity
@@ -62,10 +63,11 @@
   components:
     - type: StorageFill
       contents:
-        - id: MagazineRifle556UEG
-          amount: 3
-        - id: MagazinePistol
+        - id: TearGasGrenade
+          amount: 2
+        - id: MagazinePistol45ACP
           amount: 2
+        - id: WeaponPistolACP14
 
 - type: entity
   categories: [ HideSpawnMenu ]
@@ -81,6 +83,34 @@
         - id: MagazineRifle556UEG
           amount: 4
 
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: ClothingPounchMTF
+  id: ClothingPounchMTFBattleSMGMP5Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: BattleMedipen
+          amount: 2
+        - id: BattleSpaceMedipen
+          amount: 2
+        - id: MagazinePistolSubMachineGun9x17
+          amount: 4
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: ClothingPounchMTF
+  id: ClothingPounchMTFBattleSMGFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: BattleMedipen
+          amount: 2
+        - id: BattleSpaceMedipen
+          amount: 2
+        - id: MagazinePistolTopSubMachineGun
+          amount: 4
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: ClothingPounchMTF
@@ -94,8 +124,24 @@
           amount: 3
         - id: SyringeBluespace
         - id: HandheldHealthAnalyzer
-        - id: MagazinePistol
-          amount: 2
+        - id: OmnimedTool
+
+- type: entity
+  id: ClothingBeltMedicalEps11Filled
+  parent: ClothingBeltMedical
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents:
+      - id: MedicatedSuture
+        amount: 3
+      - id: RegenerativeMesh
+        amount: 1
+      - id: Bloodpack
+        amount: 2
+      - id: Gauze
+      - id: EmergencyMedipen
+        amount: 2
 
 - type: entity
   parent: Medkit

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

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [GunSafe, BaseSecurityContraband]
+  parent: GunSafeBaseSecure
   id: GunSafeRifleAR18
   name: ar rifle safe
   components:
@@ -11,7 +11,7 @@
       amount: 4
 
 - type: entity
-  parent: [GunSafe, BaseSecurityContraband]
+  parent: GunSafeBaseSecure
   id: GunSafeSubMachineGunVector
   name: Vector safe
   components:
@@ -23,7 +23,7 @@
       amount: 4
 
 - type: entity
-  parent: [GunSafe, BaseSecurityContraband]
+  parent: GunSafeBaseSecure
   id: GunSafeShotgunShotgun39
   name: XM1014 safe
   components:
@@ -35,7 +35,7 @@
       amount: 4
 
 - type: entity
-  parent: [GunSafe, BaseSecurityContraband]
+  parent: GunSafeBaseSecure
   id: GunSafeShotgunTrenchgun
   name: trenchgun safe
   components:
@@ -47,7 +47,7 @@
       amount: 4
 
 - type: entity
-  parent: [GunSafe, BaseSecurityContraband]
+  parent: GunSafeBaseSecure
   id: GunSafeSubMachineGunMP5
   name: mp5 safe
   components:
@@ -59,11 +59,24 @@
       amount: 4
 
 - type: entity
-  parent: GunSafe
+  parent: GunSafeBaseSecure
   id: GunSafeLaserCarbineUEG
   name: laser safe
   components:
   - type: StorageFill
     contents:
     - id: WeaponEarthGovLaserRifle
       amount: 3
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafePistolGlock
+  name: G22 safe
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolG22
+      amount: 4
+    - id: MagazinePistol9x17
+      amount: 8

Resources/Prototypes/_Backmen/Catalog/uplink_catalog.yml

@@ -87,15 +87,15 @@
   categories:
   - UplinkPointless
 
-- type: listing
-  id: UplinkMagazineBoxHeavyRifle
-  name: uplink-box-heavy-rifle-name
-  description: uplink-box-heavy-rifle-desc
-  productEntity: MagazineBoxHeavyRifle
-  cost:
-    Telecrystal: 3
-  categories:
-  - UplinkAmmo
+#- type: listing
+#  id: UplinkMagazineBoxHeavyRifle
+#  name: uplink-box-heavy-rifle-name
+#  description: uplink-box-heavy-rifle-desc
+#  productEntity: MagazineBoxHeavyRifle
+#  cost:
+#    Telecrystal: 3
+#  categories:
+#  - UplinkAmmo
 
 - type: listing
   id: UplinkMagazineBoxRifleLightSniper