Assorted fixes (#130)

* thirst and starvation damage

* removes wrong recipes

* mine pressure fix

* inhand fixes

* caliber fixes

* missing calibers

Content.Shared/Nutrition/Components/ThirstComponent.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Alert;
+using Content.Shared.Damage;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -31,6 +32,13 @@ public sealed partial class ThirstComponent : Component
     [AutoNetworkedField]
     public float CurrentThirst = -1f;
 
+    /// <summary>
+    /// Damage dealt when your current threshold is at HungerThreshold.Dead
+    /// </summary>
+    [DataField("thirstDamage")]
+    public DamageSpecifier? ThirstDamage;
+
+
     /// <summary>
     /// The time when the hunger will update next.
     /// </summary>

Content.Shared/Nutrition/EntitySystems/HungerSystem.cs

@@ -47,8 +47,8 @@ public override void Initialize()
     private void OnMapInit(EntityUid uid, HungerComponent component, MapInitEvent args)
     {
         var amount = _random.Next(
-            (int) component.Thresholds[HungerThreshold.Peckish] + 10,
-            (int) component.Thresholds[HungerThreshold.Okay]);
+            (int)component.Thresholds[HungerThreshold.Peckish] + 10,
+            (int)component.Thresholds[HungerThreshold.Okay]);
         SetHunger(uid, amount, component);
     }
 

Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs

@@ -10,6 +10,8 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Damage;
+using Content.Shared.Mobs.Systems;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
@@ -22,6 +24,8 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
@@ -47,8 +51,8 @@ private void OnMapInit(EntityUid uid, ThirstComponent component, MapInitEvent ar
         if (component.CurrentThirst < 0)
         {
             component.CurrentThirst = _random.Next(
-                (int) component.ThirstThresholds[ThirstThreshold.Thirsty] + 10,
-                (int) component.ThirstThresholds[ThirstThreshold.Okay] - 1);
+                (int)component.ThirstThresholds[ThirstThreshold.Thirsty] + 10,
+                (int)component.ThirstThresholds[ThirstThreshold.Okay] - 1);
         }
         component.NextUpdateTime = _timing.CurTime;
         component.CurrentThirstThreshold = GetThirstThreshold(component, component.CurrentThirst);
@@ -57,7 +61,7 @@ private void OnMapInit(EntityUid uid, ThirstComponent component, MapInitEvent ar
         UpdateEffects(uid, component);
 
         TryComp(uid, out MovementSpeedModifierComponent? moveMod);
-            _movement.RefreshMovementSpeedModifiers(uid, moveMod);
+        _movement.RefreshMovementSpeedModifiers(uid, moveMod);
     }
 
     private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args)
@@ -196,6 +200,18 @@ private void UpdateEffects(EntityUid uid, ThirstComponent component)
         }
     }
 
+    private void DoContinuousThirstEffects(EntityUid uid, ThirstComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (component.CurrentThirstThreshold <= ThirstThreshold.Parched &&
+            component.ThirstDamage is { } damage &&
+            !_mobState.IsDead(uid))
+        {
+            _damageable.TryChangeDamage(uid, damage, true, false);
+        }
+    }
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -216,6 +232,7 @@ public override void Update(float frameTime)
 
             thirst.CurrentThirstThreshold = calculatedThirstThreshold;
             UpdateEffects(uid, thirst);
+            DoContinuousThirstEffects(uid, thirst);
         }
     }
 }

Resources/Prototypes/Civ14/Entities/Objects/Guns/entities_calibers.yml

@@ -5,6 +5,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_musketball
+    - type: Tag
+      tags:
+        - civ13_caliber_musketball
 - type: entity
   id: civ13_caliber_stoneball
   name: stone ball projectile
@@ -12,6 +15,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_stoneball
+    - type: Tag
+      tags:
+        - civ13_caliber_stoneball
 - type: entity
   id: civ13_caliber_musketball_pistol
   name: pistol cartridge
@@ -19,6 +25,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_musketball_pistol
+    - type: Tag
+      tags:
+        - civ13_caliber_musketball_pistol
 - type: entity
   id: civ13_caliber_blunderbuss
   name: blunderbuss cartridge
@@ -26,6 +35,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_blunderbuss
+    - type: Tag
+      tags:
+        - civ13_caliber_blunderbuss
 - type: entity
   id: civ13_caliber_a65x50
   name: 6.5x50mm Arisaka cartridge
@@ -33,6 +45,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a65x50
+    - type: Tag
+      tags:
+        - civ13_caliber_a65x50
 - type: entity
   id: civ13_caliber_a50cal
   name: .50 BMG cartridge
@@ -40,6 +55,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a50cal
+    - type: Tag
+      tags:
+        - civ13_caliber_a50cal
 - type: entity
   id: civ13_caliber_a50cal_ap
   name: .50 BMG AP cartridge
@@ -47,6 +65,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a50cal
+    - type: Tag
+      tags:
+        - civ13_caliber_a50cal_ap
 - type: entity
   id: civ13_caliber_a50cal_he
   name: .50 BMG HE cartridge
@@ -54,6 +75,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a50cal
+    - type: Tag
+      tags:
+        - civ13_caliber_a50cal_he
 - type: entity
   id: civ13_caliber_a145
   name: 14.5x114 cartridge
@@ -61,6 +85,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a145
+    - type: Tag
+      tags:
+        - civ13_caliber_a145
 - type: entity
   id: civ13_caliber_a127
   name: 12.7x108 cartridge
@@ -68,6 +95,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a127
+    - type: Tag
+      tags:
+        - civ13_caliber_a127
 - type: entity
   id: civ13_caliber_a145_ap
   name: 14.5x114 AP cartridge
@@ -75,6 +105,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a145
+    - type: Tag
+      tags:
+        - civ13_caliber_a145_ap
 - type: entity
   id: civ13_caliber_a15115
   name: 15x115 cartridge
@@ -82,6 +115,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a15115
+    - type: Tag
+      tags:
+        - civ13_caliber_a15115
 - type: entity
   id: civ13_caliber_a15115_ap
   name: 15x115 AP cartridge
@@ -89,6 +125,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a15115
+    - type: Tag
+      tags:
+        - civ13_caliber_a15115_ap
 - type: entity
   id: civ13_caliber_a15115_aphe
   name: 15x115 APHE cartridge
@@ -96,6 +135,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a15115
+    - type: Tag
+      tags:
+        - civ13_caliber_a15115_aphe
 - type: entity
   id: civ13_caliber_a792x94
   name: 7.92x94mm cartridge
@@ -103,6 +145,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a792x94
+    - type: Tag
+      tags:
+        - civ13_caliber_a792x94
 - type: entity
   id: civ13_caliber_a792x94_ap
   name: 7.92x94mm AP cartridge
@@ -110,6 +155,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a792x94
+    - type: Tag
+      tags:
+        - civ13_caliber_a792x94_ap
 - type: entity
   id: civ13_caliber_a65x52
   name: 6.5x52mm Carcano cartridge
@@ -117,6 +165,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a65x52
+    - type: Tag
+      tags:
+        - civ13_caliber_a65x52
 - type: entity
   id: civ13_caliber_a8x53
   name: 8x53mm Murata cartridge
@@ -124,6 +175,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a8x53
+    - type: Tag
+      tags:
+        - civ13_caliber_a8x53
 - type: entity
   id: civ13_caliber_a8x50
   name: 8x50mmR Lebel cartridge
@@ -131,6 +185,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a8x50
+    - type: Tag
+      tags:
+        - civ13_caliber_a8x50
 - type: entity
   id: civ13_caliber_c9mm_jap_revolver
   name: 9x22mm Type 26 cartridge
@@ -138,6 +195,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_c9mm_jap_revolver
+    - type: Tag
+      tags:
+        - civ13_caliber_c9mm_jap_revolver
 - type: entity
   id: civ13_caliber_a41
   name: .41 Short cartridge
@@ -145,6 +205,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a41
+    - type: Tag
+      tags:
+        - civ13_caliber_a41
 - type: entity
   id: civ13_caliber_a43
   name: .43 Spanish cartridge
@@ -152,6 +215,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a43
+    - type: Tag
+      tags:
+        - civ13_caliber_a43
 - type: entity
   id: civ13_caliber_a32
   name: .32 S&W cartridge
@@ -159,6 +225,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a32
+    - type: Tag
+      tags:
+        - civ13_caliber_a32
 - type: entity
   id: civ13_caliber_a38
   name: .38 cartridge
@@ -166,6 +235,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a38
+    - type: Tag
+      tags:
+        - civ13_caliber_a38
 - type: entity
   id: civ13_caliber_a380acp
   name: .380 ACP Cartridge
@@ -173,6 +245,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a380acp
+    - type: Tag
+      tags:
+        - civ13_caliber_a380acp
 - type: entity
   id: civ13_caliber_a45
   name: .45 Long Colt cartridge
@@ -180,6 +255,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a45
+    - type: Tag
+      tags:
+        - civ13_caliber_a45
 - type: entity
   id: civ13_caliber_a45acp
   name: .45 ACP cartridge
@@ -187,6 +265,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a45
+    - type: Tag
+      tags:
+        - civ13_caliber_a45acp
 - type: entity
   id: civ13_caliber_a455
   name: .455 Webley cartridge
@@ -194,6 +275,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a455
+    - type: Tag
+      tags:
+        - civ13_caliber_a455
 - type: entity
   id: civ13_caliber_a44
   name: .44-40 Winchester cartridge
@@ -201,6 +285,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a44
+    - type: Tag
+      tags:
+        - civ13_caliber_a44
 - type: entity
   id: civ13_caliber_a44magnum
   name: .44 Magnum cartridge
@@ -208,6 +295,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a44magnum
+    - type: Tag
+      tags:
+        - civ13_caliber_a44magnum
 - type: entity
   id: civ13_caliber_a4570
   name: .45-70 Government cartridge
@@ -215,6 +305,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a4570
+    - type: Tag
+      tags:
+        - civ13_caliber_a4570
 - type: entity
   id: civ13_caliber_a792x57
   name: 7.92x57mm Mauser cartridge
@@ -222,6 +315,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a792x57
+    - type: Tag
+      tags:
+        - civ13_caliber_a792x57
 - type: entity
   id: civ13_caliber_a765x53
   name: 7.65x53mm Mauser cartridge
@@ -229,6 +325,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a765x53
+    - type: Tag
+      tags:
+        - civ13_caliber_a765x53
 - type: entity
   id: civ13_caliber_a765x25
   name: 7.65x25 Borchardt cartridge
@@ -236,6 +335,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a765x25
+    - type: Tag
+      tags:
+        - civ13_caliber_a765x25
 - type: entity
   id: civ13_caliber_a7x57
   name: 7x57mm Mauser cartridge
@@ -243,6 +345,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a7x57
+    - type: Tag
+      tags:
+        - civ13_caliber_a7x57
 - type: entity
   id: civ13_caliber_a77x58
   name: 7.7x58mm Arisaka cartridge
@@ -250,6 +355,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a77x58
+    - type: Tag
+      tags:
+        - civ13_caliber_a77x58
 - type: entity
   id: civ13_caliber_a77x58_wood
   name: 7.7x58mm bullet
@@ -257,6 +365,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a77x58_wood
+    - type: Tag
+      tags:
+        - civ13_caliber_a77x58_wood
 - type: entity
   id: civ13_caliber_a577
   name: .577/450 Martini-Henry cartridge
@@ -264,6 +375,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a577
+    - type: Tag
+      tags:
+        - civ13_caliber_a577
 - type: entity
   id: civ13_caliber_a762x54
   name: 7.62x54mmR cartridge
@@ -271,6 +385,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a762x54
+    - type: Tag
+      tags:
+        - civ13_caliber_a762x54
 - type: entity
   id: civ13_caliber_a303
   name: .303 british cartridge
@@ -278,6 +395,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a303
+    - type: Tag
+      tags:
+        - civ13_caliber_a303
 - type: entity
   id: civ13_caliber_a3006
   name: .30-06 cartridge
@@ -285,6 +405,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a3006
+    - type: Tag
+      tags:
+        - civ13_caliber_a3006
 - type: entity
   id: civ13_caliber_a762x38
   name: 7.62x38mmR cartridge
@@ -292,6 +415,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a762x38
+    - type: Tag
+      tags:
+        - civ13_caliber_a762x38
 - type: entity
   id: civ13_caliber_a8x27
   name: 8x27mmR french ordnance cartridge
@@ -299,6 +425,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a8x27
+    - type: Tag
+      tags:
+        - civ13_caliber_a8x27
 - type: entity
   id: civ13_caliber_c8mmnambu
   name: 8x22mm Nambu Cartridge
@@ -306,6 +435,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_c8mmnambu
+    - type: Tag
+      tags:
+        - civ13_caliber_c8mmnambu
 - type: entity
   id: civ13_caliber_a9x19
   name: 9x19mm cartridge
@@ -313,6 +445,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a9x19
+    - type: Tag
+      tags:
+        - civ13_caliber_a9x19
 - type: entity
   id: civ13_caliber_a9x18
   name: 9x18mm Makarov cartridge
@@ -320,6 +455,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a9x18
+    - type: Tag
+      tags:
+        - civ13_caliber_a9x18
 - type: entity
   id: civ13_caliber_a762x25
   name: 7.62x25mm TT cartridge
@@ -327,6 +465,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a762x25
+    - type: Tag
+      tags:
+        - civ13_caliber_a762x25
 
 - type: entity
   id: civ13_caliber_a792x33
@@ -335,6 +476,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a792x33
+    - type: Tag
+      tags:
+        - civ13_caliber_a792x33
 - type: entity
   id: civ13_caliber_a545x39
   name: 5.45x39mm cartridge
@@ -342,6 +486,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a545x39
+    - type: Tag
+      tags:
+        - civ13_caliber_a545x39
 - type: entity
   id: civ13_caliber_a32acp
   name: .32 ACP cartridge
@@ -349,6 +496,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a32acp
+    - type: Tag
+      tags:
+        - civ13_caliber_a32acp
 - type: entity
   id: civ13_caliber_webly445
   name: Bugged bullet
@@ -356,6 +506,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_webly445
+    - type: Tag
+      tags:
+        - civ13_caliber_webly445
 - type: entity
   id: civ13_caliber_a556x45
   name: 5.56x45mm NATO cartridge
@@ -363,6 +516,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a556x45
+    - type: Tag
+      tags:
+        - civ13_caliber_a556x45
 - type: entity
   id: civ13_caliber_a762x51
   name: 7.62x51mm NATO cartridge
@@ -370,6 +526,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a762x51
+    - type: Tag
+      tags:
+        - civ13_caliber_a762x51
 - type: entity
   id: civ13_caliber_a762x39
   name: 7.62x39mm cartridge
@@ -377,6 +536,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a762x39
+    - type: Tag
+      tags:
+        - civ13_caliber_a762x39
 - type: entity
   id: civ13_caliber_a762x33
   name: 7.62x33mm cartridge
@@ -384,6 +546,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a762x33
+    - type: Tag
+      tags:
+        - civ13_caliber_a762x33
 - type: entity
   id: civ13_caliber_a9x39
   name: 9x39mm cartridge
@@ -391,6 +556,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a9x39
+    - type: Tag
+      tags:
+        - civ13_caliber_a9x39
 - type: entity
   id: civ13_caliber_a44p
   name: Bugged bullet
@@ -398,6 +566,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a44p
+    - type: Tag
+      tags:
+        - civ13_caliber_a44p
 - type: entity
   id: civ13_caliber_a57x28
   name: 57x28mm cartridge
@@ -405,6 +576,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a57x28
+    - type: Tag
+      tags:
+        - civ13_caliber_a57x28
 - type: entity
   id: civ13_caliber_a58x42
   name: 5.8x42mm cartridge
@@ -412,6 +586,9 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a58x42
+    - type: Tag
+      tags:
+        - civ13_caliber_a58x42
 - type: entity
   id: civ13_caliber_a357
   name: .357 Magnum cartridge
@@ -419,3 +596,6 @@
   components:
     - type: CartridgeAmmo
       proto: civ13_bullet_a357
+    - type: Tag
+      tags:
+        - civ13_caliber_a357

Resources/Prototypes/Civ14/Entities/Objects/Guns/entities_pistol.yml

@@ -649,11 +649,9 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/Guns/colt.rsi
-
     - type: Clothing
       sprite: Civ14/Weapons/Guns/colt.rsi
       quickEquip: false
-
     - type: Gun
       fireRate: 3
       selectedMode: SemiAuto
@@ -661,17 +659,15 @@
         - SemiAuto
       soundGunshot:
         path: /Audio/Weapons/Guns/Fire/45ACP.ogg
-
     - type: ItemSlots
       slots:
         gun_magazine:
           name: Magazine
-          startingItem: civ13_magazine_default
-
+          startingItem: civ13_magazine_M1911_magazine_(.45)
           priority: 2
           whitelist:
             tags:
-              - civ13_magazine_default
+              - civ13_magazine_M1911_magazine_(.45)
           whitelistFailPopup: gun-magazine-whitelist-fail
         gun_chamber:
           name: Chamber

Resources/Prototypes/Civ14/Entities/Objects/Guns/magazine_tags.yml

@@ -7,9 +7,15 @@
 
 - type: Tag
   id: civ13_caliber_a145
+- type: Tag
+  id: civ13_caliber_a145_ap
 
 - type: Tag
   id: civ13_caliber_a15115
+- type: Tag
+  id: civ13_caliber_a15115_ap
+- type: Tag
+  id: civ13_caliber_a15115_aphe
 
 - type: Tag
   id: civ13_caliber_a3006
@@ -62,6 +68,12 @@
 - type: Tag
   id: civ13_caliber_a50cal
 
+- type: Tag
+  id: civ13_caliber_a50cal_ap
+
+- type: Tag
+  id: civ13_caliber_a50cal_he
+
 - type: Tag
   id: civ13_caliber_a545x39
 
@@ -148,7 +160,18 @@
 
 - type: Tag
   id: civ13_caliber_webly445
-
+- type: Tag
+  id: civ13_caliber_musketball
+- type: Tag
+  id: civ13_caliber_stoneball
+- type: Tag
+  id: civ13_caliber_musketball_pistol
+- type: Tag
+  id: civ13_caliber_blunderbuss
+- type: Tag
+  id: civ13_caliber_a77x58_wood
+- type: Tag
+  id: civ13_caliber_a57x28
 # Generated list of entity IDs from entities_magazines.yml as Tags
 
 - type: Tag

Resources/Prototypes/Civ14/Entities/Objects/Weapons/spears.yml

@@ -8,6 +8,7 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/assagai.rsi
+
     - type: MeleeWeapon
       damage:
         types:
@@ -15,6 +16,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/assagai.rsi
     - type: DisarmMalus
     - type: Construction
@@ -28,6 +30,7 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/dory.rsi
+
     - type: MeleeWeapon
       range: 1.8
       attackRate: 0.8
@@ -39,6 +42,7 @@
     - type: STWeight
       self: 16        
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/dory.rsi
     - type: DisarmMalus
     - type: Construction
@@ -52,6 +56,7 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/sarissa.rsi
+
     - type: MeleeWeapon
       attackRate: 0.6
       range: 2.1
@@ -63,6 +68,7 @@
     - type: STWeight
       self: 16        
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/sarissa.rsi
     - type: DisarmMalus
     - type: Construction
@@ -77,6 +83,7 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/pike.rsi
+
     - type: MeleeWeapon
       damage:
         types:
@@ -86,6 +93,7 @@
     - type: STWeight
       self: 12     
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/pike.rsi
     - type: DisarmMalus
     - type: Construction
@@ -101,6 +109,7 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/naginata.rsi
+
     - type: MeleeWeapon
       range: 1.6
       damage:
@@ -115,6 +124,7 @@
           Piercing: 5
           Slash: 2
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/naginata.rsi
     - type: DisarmMalus
     - type: Construction
@@ -128,6 +138,7 @@
   components:
     - type: Sprite
       sprite: Civ14/Weapons/halberd.rsi
+
     - type: MeleeWeapon
       damage:
         types:
@@ -136,6 +147,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/halberd.rsi
     - type: DisarmMalus
     - type: Construction

Resources/Prototypes/Civ14/Entities/Objects/Weapons/stone_age.yml

@@ -20,6 +20,7 @@
     - type: STWeight
       self: 3
     - type: Item
+      heldPrefix: null
       size: Normal
     - type: Clothing
       sprite: Civ14/Objects/StoneAge/club.rsi

Resources/Prototypes/Civ14/Entities/Objects/Weapons/swords.yml

@@ -13,6 +13,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/wood_sword.rsi
     - type: DisarmMalus
     - type: Construction
@@ -33,6 +34,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/bokken_sword.rsi
     - type: DisarmMalus
     - type: Construction
@@ -55,6 +57,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/katana.rsi
     - type: DisarmMalus
 
@@ -75,6 +78,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/wakazashi.rsi
     - type: DisarmMalus
 
@@ -93,6 +97,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/smallsword.rsi
     - type: DisarmMalus
 
@@ -112,6 +117,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/spadroon.rsi
     - type: DisarmMalus
 
@@ -131,6 +137,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/armingsword.rsi
     - type: DisarmMalus
 
@@ -150,6 +157,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/viking_sword.rsi
     - type: DisarmMalus
 
@@ -169,6 +177,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/mersksword.rsi
     - type: DisarmMalus
 
@@ -187,6 +196,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/bolo.rsi
     - type: DisarmMalus
 
@@ -207,6 +217,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/kukri.rsi
     - type: DisarmMalus
 
@@ -225,6 +236,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/cutlass.rsi
     - type: DisarmMalus
 
@@ -243,6 +255,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/scimitar.rsi
     - type: DisarmMalus
 
@@ -263,6 +276,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/longquan.rsi
     - type: DisarmMalus
 
@@ -282,6 +296,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/umar_sword.rsi
     - type: DisarmMalus
 
@@ -302,6 +317,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/sabre.rsi
     - type: DisarmMalus
 
@@ -326,6 +342,7 @@
           Piercing: 5
           Slash: 2
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/longsword.rsi
     - type: DisarmMalus
 
@@ -350,6 +367,7 @@
           Piercing: 8
           Slash: 13
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/zweihander.rsi
     - type: DisarmMalus
 
@@ -374,6 +392,7 @@
           Piercing: 8
           Slash: 13
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/claymore.rsi
     - type: DisarmMalus
 
@@ -396,6 +415,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/rapier.rsi
     - type: DisarmMalus
 
@@ -420,6 +440,7 @@
           Piercing: 2
           Slash: 15 
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/broadsword.rsi
     - type: DisarmMalus
 
@@ -439,6 +460,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/gladius.rsi
     - type: DisarmMalus
 
@@ -459,6 +481,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/gaelic_short.rsi
     - type: DisarmMalus
 
@@ -477,6 +500,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/khopesh.rsi
     - type: DisarmMalus
 
@@ -497,6 +521,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/gladius.rsi
     - type: DisarmMalus
 
@@ -517,6 +542,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/imperial.rsi
     - type: DisarmMalus
 
@@ -537,6 +563,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/longclaw.rsi
     - type: DisarmMalus
 
@@ -556,6 +583,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/shashka.rsi
     - type: DisarmMalus
 
@@ -577,6 +605,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/arabsword1.rsi
     - type: DisarmMalus
 
@@ -597,6 +626,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/arabsword2.rsi
     - type: DisarmMalus
 
@@ -615,6 +645,7 @@
       soundHit:
         path: /Audio/Weapons/bladeslice.ogg
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/urukhaiscimitar.rsi
     - type: DisarmMalus
 

Resources/Prototypes/Civ14/Entities/Structures/Craft/shields.yml

@@ -7,6 +7,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/nguni_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -23,6 +24,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/nguni_shield.rsi
     - type: Destructible
       thresholds:
@@ -44,6 +46,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/steel_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -60,6 +63,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/steel_shield.rsi
     - type: Destructible
       thresholds:
@@ -79,6 +83,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/iron_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -95,6 +100,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/iron_shield.rsi
     - type: Destructible
       thresholds:
@@ -114,6 +120,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/semioval_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -130,6 +137,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/semioval_shield.rsi
     - type: Destructible
       thresholds:
@@ -149,6 +157,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/semioval_shield_templar.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -165,6 +174,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/semioval_shield_templar.rsi
     - type: Destructible
       thresholds:
@@ -184,6 +194,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/semioval_shield_templar2.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -200,6 +211,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/semioval_shield_templar2.rsi
     - type: Destructible
       thresholds:
@@ -219,6 +231,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/orc_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -235,6 +248,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/orc_shield.rsi
     - type: Destructible
       thresholds:
@@ -254,6 +268,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/bronze_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -270,6 +285,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/bronze_shield.rsi
     - type: Destructible
       thresholds:
@@ -289,6 +305,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/athenian_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -305,6 +322,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/athenian_shield.rsi
     - type: Destructible
       thresholds:
@@ -323,6 +341,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/pegasus_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -339,6 +358,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/pegasus_shield.rsi
     - type: Destructible
       thresholds:
@@ -357,6 +377,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/owl_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -373,6 +394,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/owl_shield.rsi
     - type: Destructible
       thresholds:
@@ -392,6 +414,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/spartan_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -408,6 +431,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/spartan_shield.rsi
     - type: Destructible
       thresholds:
@@ -427,6 +451,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/egyptian_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -443,6 +468,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/egyptian_shield.rsi
     - type: Destructible
       thresholds:
@@ -462,6 +488,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/scutum.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -478,6 +505,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/scutum.rsi
     - type: Destructible
       thresholds:
@@ -500,6 +528,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/prae_roman_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -516,6 +545,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/prae_roman_shield.rsi
     - type: Destructible
       thresholds:
@@ -535,6 +565,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/chimalli.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -551,6 +582,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/chimalli.rsi
     - type: Destructible
       thresholds:
@@ -573,6 +605,7 @@
     - type: Sprite
       state: icon
       sprite: Civ14/Weapons/arabic_shield.rsi
+
     - type: Blocking
       passiveBlockModifier:
         coefficients:
@@ -589,6 +622,7 @@
           Slash: 1
           Piercing: 1
     - type: Item
+      heldPrefix: null
       sprite: Civ14/Weapons/arabic_shield.rsi
     - type: Destructible
       thresholds:

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -6,10 +6,16 @@
   abstract: true
   components:
     - type: Hunger
+      starvationDamage:
+        types:
+          Poison: 0.0166
     - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason.
       sprite: Mobs/Species/Human/parts.rsi
       state: full
     - type: Thirst
+      thirstDamage:
+        types:
+          Poison: 0.0166
     - type: RotInto
       entity: HumanRemains
       stage: 2

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

@@ -1,72 +1,73 @@
 - type: entity
   id: BaseCartridgePistol
   name: cartridge (.35 auto)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
+  parent: [BaseCartridge, BaseSecurityContraband]
   abstract: true
   components:
-  - type: Tag
-    tags:
-      - Cartridge
-      - CartridgePistol
-  - type: CartridgeAmmo
-    proto: BulletPistol
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
-    layers:
-      - state: base
-        map: [ "enum.AmmoVisualLayers.Base" ]
-  - type: Appearance
-  - type: SpentAmmoVisuals
+    - type: Tag
+      tags:
+        - Cartridge
+        - CartridgePistol
+    - type: CartridgeAmmo
+      proto: BulletPistol
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+      layers:
+        - state: base
+          map: ["enum.AmmoVisualLayers.Base"]
+    - type: Appearance
+    - type: SpentAmmoVisuals
 
 - type: entity
   id: CartridgePistol
   name: cartridge (.35 auto)
   parent: BaseCartridgePistol
   components:
-  - type: CartridgeAmmo
-    proto: BulletPistol
-
+    - type: CartridgeAmmo
+      proto: BulletPistol
+    - type: STWeight
+      self: 0.01
 - type: entity
   id: CartridgePistolPractice
   name: cartridge (.35 auto practice)
   parent: BaseCartridgePistol
   components:
-  - type: CartridgeAmmo
-    proto: BulletPistolPractice
-  -  type: Sprite
-     layers:
-       - state: base
-         map: [ "enum.AmmoVisualLayers.Base" ]
-       - state: tip
-         map: [ "enum.AmmoVisualLayers.Tip" ]
-         color: "#dbdbdb"
+    - type: CartridgeAmmo
+      proto: BulletPistolPractice
+    - type: Sprite
+      layers:
+        - state: base
+          map: ["enum.AmmoVisualLayers.Base"]
+        - state: tip
+          map: ["enum.AmmoVisualLayers.Tip"]
+          color: "#dbdbdb"
 
 - type: entity
   id: CartridgePistolIncendiary
   name: cartridge (.35 auto incendiary)
   parent: BaseCartridgePistol
   components:
-  - type: CartridgeAmmo
-    proto: BulletPistolIncendiary
-  - type: Sprite
-    layers:
-      - state: base
-        map: [ "enum.AmmoVisualLayers.Base" ]
-      - state: tip
-        map: [ "enum.AmmoVisualLayers.Tip" ]
-        color: "#ff6e52"
+    - type: CartridgeAmmo
+      proto: BulletPistolIncendiary
+    - type: Sprite
+      layers:
+        - state: base
+          map: ["enum.AmmoVisualLayers.Base"]
+        - state: tip
+          map: ["enum.AmmoVisualLayers.Tip"]
+          color: "#ff6e52"
 
 - type: entity
   id: CartridgePistolUranium
   name: cartridge (.35 auto uranium)
   parent: BaseCartridgePistol
   components:
-  - type: CartridgeAmmo
-    proto: BulletPistolUranium
-  - type: Sprite
-    layers:
-      - state: base
-        map: [ "enum.AmmoVisualLayers.Base" ]
-      - state: tip
-        map: [ "enum.AmmoVisualLayers.Tip" ]
-        color: "#65fe08"
+    - type: CartridgeAmmo
+      proto: BulletPistolUranium
+    - type: Sprite
+      layers:
+        - state: base
+          map: ["enum.AmmoVisualLayers.Base"]
+        - state: tip
+          map: ["enum.AmmoVisualLayers.Tip"]
+          color: "#65fe08"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -12,7 +12,7 @@
         - state: mag-0
           map: ["enum.GunVisualLayers.Mag"]
     - type: STWeight
-      self: 1
+      self: 1.5
     - type: Item
       size: Small
       shape:

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -43,6 +43,7 @@
           density: 1000
     - type: Occluder
     - type: Airtight
+      airBlocked: false
     - type: StaticPrice
       price: 75
     - type: RadiationBlocker