(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -296,6 +296,7 @@ namespace Barotrauma
                        break;
                    }
                }
+                SoundPlayer.PlayDamageSound(damageSoundType, Math.Max(damage, bleedingDamage), WorldPosition);
            }

            // Always spawn damage particles