diff --git a/Defs/Ammo/Pistols/45ACP.xml b/Defs/Ammo/Pistols/45ACP.xml
index c6f54f0416..1e5b7fd428 100644
--- a/Defs/Ammo/Pistols/45ACP.xml
+++ b/Defs/Ammo/Pistols/45ACP.xml
@@ -108,6 +108,7 @@
true
Fleck_PistolAmmoCasings
Filth_PistolAmmoCasings
+ pistol
diff --git a/Languages/English/Keyed/Keys.xml b/Languages/English/Keyed/Keys.xml
index bf00261847..6777adde91 100644
--- a/Languages/English/Keyed/Keys.xml
+++ b/Languages/English/Keyed/Keys.xml
@@ -49,11 +49,12 @@
Out of bounds
Can't target self
- No line of sight
+ No line of sight
Blocked by roof
Shooting disallowed by
Outside of range
Within minimum range
+ bullet
Distance: {0}/{1} Tiles
diff --git a/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs b/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs
index 3a7225fa65..7f1f1f674b 100644
--- a/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs
+++ b/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs
@@ -30,7 +30,8 @@ static AmmoGeneralizer()
var sameClass = ammoSource.ammoTypes.Find(x => x.ammo.ammoClass == link.ammo.ammoClass);
if (sameClass != null)
{
- link.projectile.label = ammoSource.label + " bullet " + "(" + link.ammo.ammoClass.labelShort + ")";
+ string labelNew = (link.projectile.projectile is ProjectilePropertiesCE projPropCE && projPropCE.genericLabelOverride != null) ? projPropCE.genericLabelOverride : ammoSource.label;
+ link.projectile.label = labelNew + " " + "CE_GenericBullet".Translate() + " (" + link.ammo.ammoClass.labelShort + ")";
newAmmos.Add(new AmmoLink { ammo = sameClass.ammo, projectile = link.projectile });
}
diff --git a/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs b/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs
index 351f7c187f..bd80bc59a0 100644
--- a/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs
+++ b/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs
@@ -111,6 +111,7 @@ public List AmmoSetDefs
}
}
+ [NoTranslate]
private string oldDescription;
public void AddDescriptionParts()
{
diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs
index 3a55f3ae30..2fc86e8742 100644
--- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs
+++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs
@@ -39,6 +39,8 @@ public class ProjectilePropertiesCE : ProjectileProperties
public ThingDef detonateMoteDef;
public FleckDef detonateFleckDef;
public float detonateEffectsScaleOverride = -1;
+ [MustTranslate]
+ public string genericLabelOverride = null;
#region Bunker Buster fields
///