From 20d4597fa070e768b63b7b88f54baddffd4cebf9 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <skamonkey@gmail.com>
Date: Sun, 28 Oct 2012 19:14:04 -0400
Subject: [PATCH] Updated tf2 weapon and dmg custom defines.

---
 plugins/include/tf2_stocks.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc
index b930a704..b58060cf 100644
--- a/plugins/include/tf2_stocks.inc
+++ b/plugins/include/tf2_stocks.inc
@@ -138,6 +138,10 @@ enum {
 	TF_CUSTOM_CLEAVER,
 	TF_CUSTOM_CLEAVER_CRIT,
 	TF_CUSTOM_SAPPER_RECORDER_DEATH,
+	TF_CUSTOM_MERASMUS_PLAYER_BOMB,
+	TF_CUSTOM_MERASMUS_GRENADE,
+	TF_CUSTOM_MERASMUS_ZAP,
+	TF_CUSTOM_MERASMUS_DECAPITATION,
 };
 
 // Weapon codes as used in some events, such as player_death
@@ -231,7 +235,6 @@ enum {
 	TF_WEAPON_PEP_BRAWLER_BLASTER,
 	TF_WEAPON_CLEAVER,
 	TF_WEAPON_GRENADE_CLEAVER,
-	TF_WEAPON_ROCKETPACK,
 };
 
 // TF2 Weapon Loadout Slots