From f3c642d0d72219908a2da11c2a0235dc070cb7c2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 30 Sep 2020 19:55:22 -0400
Subject: [PATCH] Fixed #2779

---
 core/src/mindustry/content/Bullets.java                 | 3 +++
 core/src/mindustry/world/meta/values/AmmoListValue.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 2d50db9afd..9b7e5f8805 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -481,6 +481,7 @@ public class Bullets implements ContentList{
             drag = 0.001f;
             ammoMultiplier = 2f;
             statusDuration = 60f * 4f;
+            damage = 0.1f;
         }};
 
         heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{
@@ -491,6 +492,7 @@ public class Bullets implements ContentList{
             drag = 0.001f;
             ammoMultiplier = 2f;
             statusDuration = 60f * 4f;
+            damage = 0.1f;
         }};
 
         heavySlagShot = new LiquidBulletType(Liquids.slag){{
@@ -512,6 +514,7 @@ public class Bullets implements ContentList{
             drag = 0.001f;
             ammoMultiplier = 2f;
             statusDuration = 60f * 4f;
+            damage = 0.1f;
         }};
 
         driverBolt = new MassDriverBolt();
diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java
index 6b02493348..1f16f36a08 100644
--- a/core/src/mindustry/world/meta/values/AmmoListValue.java
+++ b/core/src/mindustry/world/meta/values/AmmoListValue.java
@@ -33,7 +33,7 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
             table.table(Tex.underline, bt -> {
                 bt.left().defaults().padRight(3).left();
 
-                if(type.damage > 0 && type.collides){
+                if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
                     bt.add(Core.bundle.format("bullet.damage", type.damage));
                 }