1.1 --- a/plugins/include/tf2.inc	Mon Jan 27 10:09:47 2014 -0500
     1.2 +++ b/plugins/include/tf2.inc	Mon Jan 27 10:15:17 2014 -0500
     1.3 @@ -107,18 +107,18 @@
     1.4  	TFCond_RegenBuffed,
     1.5  	TFCond_MarkedForDeath,
     1.6  	TFCond_NoHealingDamageBuff,
     1.7 -	TFCond_SpeedBuffAlly,
     1.8 +	TFCond_SpeedBuffAlly,		//32
     1.9  	TFCond_HalloweenCritCandy,
    1.10  	TFCond_CritCanteen,
    1.11 -	
    1.12 -	TFCond_CritHype = 36,
    1.13 +	TFCond_CritDemoCharge,
    1.14 +	TFCond_CritHype,
    1.15  	TFCond_CritOnFirstBlood,
    1.16  	TFCond_CritOnWin,
    1.17  	TFCond_CritOnFlagCapture,
    1.18  	TFCond_CritOnKill,
    1.19  	TFCond_RestrictToMelee,
    1.20 -	
    1.21 -	TFCond_Reprogrammed = 43,
    1.22 +	TFCond_DefenseBuffNoCritBlock,
    1.23 +	TFCond_Reprogrammed,
    1.24  	TFCond_CritMmmph,
    1.25  	TFCond_DefenseBuffMmmph,
    1.26  	TFCond_FocusBuff,
    1.27 @@ -140,16 +140,19 @@
    1.28  	TFCond_SmallBlastResist,
    1.29  	TFCond_SmallFireResist,
    1.30  	TFCond_Stealthed, // 64
    1.31 -
    1.32 -	TFCond_StealthedUserBuffFade = 66,
    1.33 -
    1.34 -	TFCond_MVMBotRadiowave = 71,
    1.35 +	TFCond_MedigunDebuff,
    1.36 +	TFCond_StealthedUserBuffFade,
    1.37 +	TFCond_BulletImmune,
    1.38 +	TFCond_BlastImmune,
    1.39 +	TFCond_FireImmune,
    1.40 +	TFCond_PreventDeath,
    1.41 +	TFCond_MVMBotRadiowave,
    1.42  	TFCond_HalloweenSpeedBoost,
    1.43  	TFCond_HalloweenQuickHeal,
    1.44  	TFCond_HalloweenGiant,
    1.45 -	TFCond_HalloweenTiny, // 75
    1.46 -
    1.47 -	TFCond_HalloweenGhostMode = 77,
    1.48 +	TFCond_HalloweenTiny,
    1.49 +	TFCond_HalloweenInHell,
    1.50 +	TFCond_HalloweenGhostMode,
    1.51  };
    1.52  
    1.53  enum TFHoliday

     2.1 --- a/plugins/include/tf2_stocks.inc	Mon Jan 27 10:09:47 2014 -0500
     2.2 +++ b/plugins/include/tf2_stocks.inc	Mon Jan 27 10:15:17 2014 -0500
     2.3 @@ -143,6 +143,7 @@
     2.4  	TF_CUSTOM_MERASMUS_ZAP,
     2.5  	TF_CUSTOM_MERASMUS_DECAPITATION,
     2.6  	TF_CUSTOM_CANNONBALL_PUSH,
     2.7 +	TF_CUSTOM_TAUNT_ALLCLASS_GUITAR_RIFF,
     2.8  };
     2.9  
    2.10  // Weapon codes as used in some events, such as player_death