diff --git a/quakec/fallout2/inventory.qc b/quakec/fallout2/inventory.qc
index ba67256c4..52b08d6aa 100644
--- a/quakec/fallout2/inventory.qc
+++ b/quakec/fallout2/inventory.qc
@@ -744,42 +744,43 @@ string(float iid) GetItemName =
 		return "ripper";
 	if (iid == IID_WP_POWERAXE)
 		return "poweraxe";
+
 	if (iid == IID_WP_USP)
-		return "1911";
+		return "1911 (10mm)";
 	if (iid == IID_WP_DEAGLE)
-		return "desert eagle";
+		return "desert eagle (.44mag)";
 	if (iid == IID_WP_NEEDLER)
 		return "needler";
 	if (iid == IID_WP_ALIENBLASTER)
-		return "alien blaster";
+		return "alien blaster (energy)";
 	if (iid == IID_WP_PIPERIFLE)
-		return "pipe rifle";
+		return "pipe rifle (10mm)";
 	if (iid == IID_WP_WINCHESTER)
-		return "winchester";
+		return "winchester (12g)";
 	if (iid == IID_WP_MOSSBERG)
-		return "mossberg";
+		return "mossberg (12g)";
 	if (iid == IID_WP_JACKHAMMER)
-		return "jackhammer";
+		return "jackhammer (12g)";
 	if (iid == IID_WP_MP9)
-		return "mp9";
+		return "mp9 (10mm)";
 	if (iid == IID_WP_MP7)
-		return "grease gun";
+		return "grease gun (10mm)";
 	if (iid == IID_WP_RANGEMASTER)
-		return "rangemaster";
+		return "rangemaster (5.56mm)";
 	if (iid == IID_WP_AK112)
-		return "ak-112";
+		return "ak-112 (5mm-hv)";
 	if (iid == IID_WP_AK74)
-		return "ak-74";
+		return "ak-74 (5mm-hv)";
 	if (iid == IID_WP_DKS1)
-		return "dks-1";
+		return "dks-1 (7.62mm)";
 	if (iid == IID_WP_MOONLIGHT)
-		return "moonlight";
+		return "moonlight (5.56mm)";
 	if (iid == IID_WP_SA80)
-		return "sa-80";
+		return "sa-80 (5.56mm)";
 	if (iid == IID_WP_GAUSERIFLE)
-		return "gauss rifle";
+		return "gauss rifle (2mm EC)";
 	if (iid == IID_WP_PULSERIFLE)
-		return "laser carbine";
+		return "laser carbine (energy)";
 
 
 
diff --git a/quakec/fallout2/weapons.qc b/quakec/fallout2/weapons.qc
index 77de08679..0183e71d2 100644
--- a/quakec/fallout2/weapons.qc
+++ b/quakec/fallout2/weapons.qc
@@ -1087,13 +1087,8 @@ void() W_Attack =
 	else if (weap == IID_WP_MP9)
 		FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.06);
 	else if (weap == IID_WP_MP7)
-<<<<<<< weapons.qc
-		FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.1);
+		FireSMG(12, 2, "weapons/mp7.wav", 2000, 0.06);
 	else if (weap == IID_WP_RANGEMASTER)
-=======
-		FireSMG(12, 2, "weapons/mp5.wav", 2000, 0.06);
-	else if (weap == IID_WP_RANGERMASTER)
->>>>>>> 1.16
 		FireAssaultRifle(14, 2, "weapons/rangem.wav", 4000, 0.5);
 	else if (weap == IID_WP_AK112)
 		FireAssaultRifle(14, 2, "weapons/rangem.wav", 4000, 0.1);