Throwing Mini-Update 1

Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs

@@ -11,6 +11,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using Content.Shared.Weapons.Melee;
+using Content.Server.Weapons.Melee;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
@@ -31,7 +32,7 @@ public override void Initialize()
             base.Initialize();
 
             SubscribeLocalEvent<StaminaComponent, BeforeThrowEvent>(OnBeforeThrow);
-            SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
+            SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine, after: [typeof(MeleeWeaponSystem)]);
         }
 
         private void OnBeforeThrow(EntityUid uid, StaminaComponent component, ref BeforeThrowEvent args)

Content.Server/Projectiles/ProjectileSystem.cs

@@ -1,12 +1,15 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Damage.Systems;
 using Content.Server.Effects;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Camera;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Database;
 using Content.Shared.Projectiles;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Projectiles;
 
@@ -22,6 +25,7 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<ProjectileComponent, StartCollideEvent>(OnStartCollide);
+        SubscribeLocalEvent<EmbeddableProjectileComponent, DamageExamineEvent>(OnDamageExamine, after: [typeof(DamageOtherOnHitSystem)]);
     }
 
     private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref StartCollideEvent args)
@@ -75,4 +79,21 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
         if (component.ImpactEffect != null && TryComp(uid, out TransformComponent? xform))
             RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, GetNetCoordinates(xform.Coordinates)), Filter.Pvs(xform.Coordinates, entityMan: EntityManager));
     }
+
+    private void OnDamageExamine(EntityUid uid, EmbeddableProjectileComponent component, ref DamageExamineEvent args)
+    {
+        if (!component.EmbedOnThrow)
+            return;
+
+        if (!args.Message.IsEmpty)
+            args.Message.PushNewline();
+
+        var isHarmful = TryComp<EmbedPassiveDamageComponent>(uid, out var passiveDamage) && passiveDamage.Damage.AnyPositive();
+        var loc = isHarmful
+            ? "damage-examine-embeddable-harmful"
+            : "damage-examine-embeddable";
+
+        var staminaCostMarkup = FormattedMessage.FromMarkupOrThrow(Loc.GetString(loc));
+        args.Message.AddMessage(staminaCostMarkup);
+    }
 }

Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.CombatMode.Disarm;
 using Content.Server.Movement.Systems;
+using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
 using Content.Shared.CombatMode;
@@ -44,7 +45,7 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<MeleeSpeechComponent, MeleeHitEvent>(OnSpeechHit);
-        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
+        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage, after: [typeof(GunSystem)]);
     }
 
     private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)

Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs

@@ -49,19 +49,19 @@ public override void Initialize()
         /// </summary>
         private void OnMapInit(EntityUid uid, DamageOtherOnHitComponent component, MapInitEvent args)
         {
-            if (!TryComp<MeleeWeaponComponent>(uid, out var melee))
-                return;
-
-            if (component.Damage.Empty)
-                component.Damage = melee.Damage * component.MeleeDamageMultiplier;
-            if (component.SoundHit == null)
-                component.SoundHit = melee.SoundHit;
-            if (component.SoundNoDamage == null)
+            if (TryComp<MeleeWeaponComponent>(uid, out var melee))
             {
-                if (melee.SoundNoDamage != null)
-                    component.SoundNoDamage = melee.SoundNoDamage;
-                else
-                    component.SoundNoDamage = new SoundCollectionSpecifier("WeakHit");
+                if (component.Damage.Empty)
+                    component.Damage = melee.Damage * component.MeleeDamageMultiplier;
+                if (component.SoundHit == null)
+                    component.SoundHit = melee.SoundHit;
+                if (component.SoundNoDamage == null)
+                {
+                    if (melee.SoundNoDamage != null)
+                        component.SoundNoDamage = melee.SoundNoDamage;
+                    else
+                        component.SoundNoDamage = new SoundCollectionSpecifier("WeakHit");
+                }
             }
 
             RaiseLocalEvent(uid, new DamageOtherOnHitStartupEvent((uid, component)));

Resources/Prototypes/Entities/Objects/Misc/tiles.yml

@@ -45,7 +45,7 @@
   - type: DamageOnLand
     damage:
       types:
-        Blunt: 5
+        Blunt: 2
 
 - type: entity
   name: steel tile

Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml

@@ -55,6 +55,7 @@
     damage:
       types:
         Piercing: 10
+    staminaCost: 6
   - type: Item
     size: Ginormous
   - type: Clothing
@@ -112,10 +113,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 5
   - type: UseDelay
   - type: Appearance
   - type: SolutionContainerVisuals

Resources/Prototypes/Entities/Structures/base_structure.yml

@@ -28,8 +28,10 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 8
+        Blunt: 9
     staminaCost: 50
+    soundHit:
+      collection: MetalThud
 
 - type: entity
   # This means that it's not anchored on spawn.