Some makeshift armors and role changes (#206)

* materials and armors * roles plus * Update hats.yml * guns and armors * last commit * broken items * fixes * Update revolvers.yml
Vault-Overseers · Jun 26, 2024 · 020b2d0 · 020b2d0
1 parent a4e9c93
commit 020b2d0
Show file tree

Hide file tree

Showing 306 changed files with 1,754 additions and 150 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -48,8 +48,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: GrenadeFlashBang
-      - id: TearGasGrenade
       - id: Stunbaton
       - id: Handcuffs
       - id: Handcuffs

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -13,6 +13,7 @@
     quickEquip: false
     slots:
     - Back
+    - suitStorage
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -20

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -15,6 +15,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - Revolver
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
     quickEquip: false

diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -37,70 +37,83 @@
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
-
-# Military
+        - id: Magazine5.56Rifle
+        - id: Magazine5.56Rifle
+        - id: N14MagazinePistol10mm
+        - id: N14MagazinePistol10mm
+
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackMilitary
-  id: N14ClothingBackpackMilitaryFilled
+  parent: N14ClothingBackpackHiking
+  id: N14ClothingBackpackCaravanLeaderFilled
   components:
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
-        - id: N14CombatKnife
-
+        - id: N14MagazinePistol12mm
+        - id: N14MagazinePistol12mm
+
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackNCR
-  id: N14ClothingBackpackNCRFilled
+  parent: N14ClothingBackpackHiking
+  id: N14ClothingBackpackCaravanTraderFilled
   components:
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
-        - id: N14CombatKnife
+        - id: Magazine45SubMachineGun
+        - id: Magazine45SubMachineGun
+        - id: N14Weapon45SMG
 
-# Vault
+# Military
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackVaultBlue
-  id: N14ClothingBackpackVaultDwellerFilled
+  parent: N14ClothingBackpackMilitary
+  id: N14ClothingBackpackMilitaryFilled
   components:
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
+        - id: N14CombatKnife
 
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackVaultRed
-  id: N14ClothingBackpackVaultSecurityFilled
+  parent: N14ClothingBackpackNCR
+  id: N14ClothingBackpackNCRFilled
   components:
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
+        - id: N14CombatKnife
 
+# Vault
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackVaultBlueDark
-  id: N14ClothingBackpackVaultOverseerFilled
+  parent: N14ClothingBackpackVaultBlue
+  id: N14ClothingBackpackVaultDwellerFilled
   components:
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
-        
+
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackVaultOrange
-  id: N14ClothingBackpackVaultEngineerFilled
+  parent: N14ClothingBackpackVaultBlue
+  id: N14ClothingBackpackVaultOverseerFilled
   components:
     - type: StorageFill
       contents:
         - id: N14BoxPlasticFilledWastelander
+        - id: N14MagazinePistol10mm
+        - id: N14MagazinePistol10mm           
 
 - type: entity
   noSpawn: true
-  parent: N14ClothingBackpackVaultPurple
-  id: N14ClothingBackpackVaultDoctorFilled
+  parent: N14ClothingBackpackVaultBlue
+  id: N14ClothingBackpackVaultSecurityFilled
   components:
     - type: StorageFill
       contents:
-        - id: N14BoxPlasticFilledWastelander
+        - id: N14BoxPlasticFilledWastelander
+        - id: N14MagazinePistol10mm
+        - id: N14MagazinePistol10mm 
diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/TownGear/backpack.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/TownGear/backpack.yml
@@ -0,0 +1,34 @@
+# Town people
+- type: entity
+  noSpawn: true
+  parent: N14ClothingBackpackExplorer
+  id: N14ClothingBackpackMayorFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14BoxPlasticFilledWastelander
+        - id: MagazineBox9mm
+
+- type: entity
+  noSpawn: true
+  parent: N14ClothingBackpackMilitary
+  id: N14ClothingBackpackSheriffFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14BoxPlasticFilledWastelander
+        - id: N14CombatKnife
+        - id: MagazineBox44
+        - id: MagazineBox308
+
+- type: entity
+  noSpawn: true
+  parent: N14ClothingBackpackMilitary
+  id: N14ClothingBackpackDeputyFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14BoxPlasticFilledWastelander
+        - id: N14CombatKnife
+        - id: MagazineBox10mm
+        - id: MagazineBox44
diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml
@@ -55,7 +55,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: GrenadeFlashBang
       - id: Stunbaton # TODO: Replace with fallout friendly baton
       - id: Handcuffs
       - id: Handcuffs
@@ -77,4 +76,4 @@
   components:
   - type: StorageFill
     contents:
-      - id: GrenadeFlashBang
+      - id: GrenadeFlashBang
diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Belt/belts.yml
@@ -96,13 +96,13 @@
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltNCRBandolier
-  name: NCR bandolier
-  description: A bandolier commonly used by NCR marksmans and pointmans to carry single shells or cartridges.
+  name: bandolier
+  description: A bandolier commonly used to carry single shells or cartridges.
   components:
   - type: Sprite
-    sprite: Nuclear14/Clothing/Belt/ncrbandolier.rsi
+    sprite: Nuclear14/Clothing/Belt/bandolier.rsi
   - type: Clothing
-    sprite: Nuclear14/Clothing/Belt/ncrbandolier.rsi
+    sprite: Nuclear14/Clothing/Belt/bandolier.rsi
   - type: Storage
     whitelist:
       tags:
@@ -120,3 +120,20 @@
     sprite: Nuclear14/Clothing/Belt/ropebelt.rsi
   - type: Clothing
     sprite: Nuclear14/Clothing/Belt/ropebelt.rsi
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltRevolver
+  name: revolver holster
+  description: Can hold security gear like handcuffs and flashes.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Clothing/Belt/revolverholster.rsi
+  - type: Clothing
+    sprite: Nuclear14/Clothing/Belt/revolverholster.rsi
+  - type: Storage
+    whitelist:
+      tags:
+        - Revolver
+        - SpeedLoader
+  - type: Appearance
diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml
@@ -15,6 +15,28 @@
 - type: entity
   parent: ClothingHeadHatTrucker
   id: N14ClothingHeadHatTrucker # N14:TODO This is the SS14 one, probably needs replaced.
+
+- type: entity
+  parent: ClothingHeadBase
+  id: N14ClothingHeadHatDeputy
+  name: deputy hat
+  description: When the sheriff cant do the job alone, there is when a deputy come in.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: N14ClothingHeadHatSheriff
+  name: sheriff hat
+  description: The law personified in a hat.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/hoshat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/hoshat.rsi
 
 - type: entity
   parent: ClothingHeadBase
@@ -270,4 +292,39 @@
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.8
+        Piercing: 0.9
+
+# Craftable
+- type: entity
+  parent: ClothingHeadBase
+  id: N14ClothingHeadHatAnimal
+  name: canine hat
+  description: Made from a dog-like creature, this wild looking hat will keep your head warm and safe.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi
+  - type: Clothing
+    sprite: Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Heat: 0.9
+
+- type: entity
+  parent: ClothingHeadBase
+  id: N14ClothingHeadHatNightstalker
+  name: nightstalker hat
+  description: A warm and resistent hat made from the head of a nightstalker.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi
+  - type: Clothing
+    sprite: Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.8
+        Heat: 0.8
diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/cloaks.yml
@@ -24,3 +24,12 @@
   components:
   - type: Sprite
     sprite: Nuclear14/Clothing/Neck/leathercloak.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakYaoguai
+  name: yaoguai cloak
+  description: A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Clothing/Neck/yaoguai.rsi