diff --git a/gamedata/sdkhooks.games/engine.ep2v.txt b/gamedata/sdkhooks.games/engine.ep2v.txt
index 9b4f20048..0fd7873f4 100644
--- a/gamedata/sdkhooks.games/engine.ep2v.txt
+++ b/gamedata/sdkhooks.games/engine.ep2v.txt
@@ -14,38 +14,38 @@
 			}
 			"CanBeAutobalanced"
 			{
-				"windows"	"473"
-				"windows64"	"473"
-				"linux"		"474"
-				"linux64"	"474"
+				"windows"	"474"
+				"windows64"	"474"
+				"linux"		"475"
+				"linux64"	"475"
 			}
 			"EndTouch"
 			{
-				"windows"	"105"
-				"windows64"	"105"
-				"linux"		"106"
-				"linux64"	"106"
+				"windows"	"106"
+				"windows64"	"106"
+				"linux"		"107"
+				"linux64"	"107"
 			}
 			"FireBullets"
 			{
-				"windows"	"117"
-				"windows64"	"117"
-				"linux"		"118"
-				"linux64"	"118"
+				"windows"	"118"
+				"windows64"	"118"
+				"linux"		"119"
+				"linux64"	"119"
 			}
 			"GetMaxHealth"
 			{
-				"windows"	"122"
-				"windows64"	"122"
-				"linux"		"123"
-				"linux64"	"123"
+				"windows"	"123"
+				"windows64"	"123"
+				"linux"		"124"
+				"linux64"	"124"
 			}
 			"GroundEntChanged"
 			{
-				"windows"	"183"
-				"windows64"	"183"
-				"linux"		"185"
-				"linux64"	"185"
+				"windows"	"184"
+				"windows64"	"184"
+				"linux"		"186"
+				"linux64"	"186"
 			}
 			"OnTakeDamage"
 			{
@@ -56,31 +56,31 @@
 			}
 			"OnTakeDamage_Alive"
 			{
-				"windows"	"282"
-				"windows64"	"282"
-				"linux"		"283"
-				"linux64"	"283"
+				"windows"	"283"
+				"windows64"	"283"
+				"linux"		"284"
+				"linux64"	"284"
 			}
 			"PreThink"
-			{
-				"windows"	"343"
-				"windows64"	"343"
-				"linux"		"344"
-				"linux64"	"344"
-			}
-			"PostThink"
 			{
 				"windows"	"344"
 				"windows64"	"344"
 				"linux"		"345"
 				"linux64"	"345"
 			}
+			"PostThink"
+			{
+				"windows"	"345"
+				"windows64"	"345"
+				"linux"		"346"
+				"linux64"	"346"
+			}
 			"Reload"
 			{
-				"windows"	"283"
-				"windows64"	"283"
-				"linux"		"289"
-				"linux64"	"289"
+				"windows"	"284"
+				"windows64"	"284"
+				"linux"		"290"
+				"linux64"	"290"
 			}
 			"SetTransmit"
 			{
@@ -105,10 +105,10 @@
 			}
 			"StartTouch"
 			{
-				"windows"	"103"
-				"windows64"	"103"
-				"linux"		"104"
-				"linux64"	"104"
+				"windows"	"104"
+				"windows64"	"104"
+				"linux"		"105"
+				"linux64"	"105"
 			}
 			"Think"
 			{
@@ -119,10 +119,10 @@
 			}
 			"Touch"
 			{
-				"windows"	"104"
-				"windows64"	"104"
-				"linux"		"105"
-				"linux64"	"105"
+				"windows"	"105"
+				"windows64"	"105"
+				"linux"		"106"
+				"linux64"	"106"
 			}
 			"TraceAttack"
 			{
@@ -133,60 +133,60 @@
 			}
 			"Use"
 			{
-				"windows"	"102"
-				"windows64"	"102"
-				"linux"		"103"
-				"linux64"	"103"
+				"windows"	"103"
+				"windows64"	"103"
+				"linux"		"104"
+				"linux64"	"104"
 			}
 			"VPhysicsUpdate"
 			{
-				"windows"	"163"
-				"windows64"	"163"
-				"linux"		"164"
-				"linux64"	"164"
+				"windows"	"164"
+				"windows64"	"164"
+				"linux"		"165"
+				"linux64"	"165"
 			}
 			"Blocked"
 			{
-				"windows"	"107"
-				"windows64"	"107"
-				"linux"		"108"
-				"linux64"	"108"
+				"windows"	"108"
+				"windows64"	"108"
+				"linux"		"109"
+				"linux64"	"109"
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"276"
-				"windows64"	"276"
-				"linux"		"277"
-				"linux64"	"277"
+				"windows"	"277"
+				"windows64"	"277"
+				"linux"		"278"
+				"linux64"	"278"
 			}
 			"Weapon_CanUse"
-			{
-				"windows"	"270"
-				"windows64"	"270"
-				"linux"		"271"
-				"linux64"	"271"
-			}
-			"Weapon_Drop"
-			{
-				"windows"	"273"
-				"windows64"	"273"
-				"linux"		"274"
-				"linux64"	"274"
-			}
-			"Weapon_Equip"
 			{
 				"windows"	"271"
 				"windows64"	"271"
 				"linux"		"272"
 				"linux64"	"272"
 			}
-			"Weapon_Switch"
+			"Weapon_Drop"
 			{
 				"windows"	"274"
 				"windows64"	"274"
 				"linux"		"275"
 				"linux64"	"275"
 			}
+			"Weapon_Equip"
+			{
+				"windows"	"272"
+				"windows64"	"272"
+				"linux"		"273"
+				"linux64"	"273"
+			}
+			"Weapon_Switch"
+			{
+				"windows"	"275"
+				"windows64"	"275"
+				"linux"		"276"
+				"linux64"	"276"
+			}
 		}
 	}
 	
diff --git a/gamedata/sdktools.games/game.tf.txt b/gamedata/sdktools.games/game.tf.txt
index 5eec1ad61..63eec1f29 100644
--- a/gamedata/sdktools.games/game.tf.txt
+++ b/gamedata/sdktools.games/game.tf.txt
@@ -25,66 +25,66 @@
 			}
 			"GiveNamedItem"
 			{
-				"windows"	"412"
-				"windows64"	"412"
-				"linux"		"413"
-				"linux64"	"413"
+				"windows"	"413"
+				"windows64"	"413"
+				"linux"		"414"
+				"linux64"	"414"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"280"
-				"windows64"	"280"
-				"linux"		"281"
-				"linux64"	"281"
+				"windows"	"281"
+				"windows64"	"281"
+				"linux"		"282"
+				"linux64"	"282"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"278"
-				"windows64"	"278"
-				"linux"		"279"
-				"linux64"	"279"
+				"windows"	"279"
+				"windows64"	"279"
+				"linux"		"280"
+				"linux64"	"280"
 			}
 			"Ignite"
 			{
-				"windows"	"219"
-				"windows64"	"219"
-				"linux"		"220"
-				"linux64"	"220"
+				"windows"	"220"
+				"windows64"	"220"
+				"linux"		"221"
+				"linux64"	"221"
 			}
 			"Extinguish"
 			{
-				"windows"	"223"
-				"windows64"	"223"
-				"linux"		"224"
-				"linux64"	"224"
+				"windows"	"224"
+				"windows64"	"224"
+				"linux"		"225"
+				"linux64"	"225"
 			}
 			"Teleport"
 			{
-				"windows"	"113"
-				"windows64"	"113"
-				"linux"		"114"
-				"linux64"	"114"
+				"windows"	"114"
+				"windows64"	"114"
+				"linux"		"115"
+				"linux64"	"115"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"453"
-				"windows64"	"453"
-				"linux"		"453"
-				"linux64"	"453"
+				"windows"	"454"
+				"windows64"	"454"
+				"linux"		"454"
+				"linux64"	"454"
 			}
 			"GetVelocity"
 			{
-				"windows"	"146"
-				"windows64"	"146"
-				"linux"		"147"
-				"linux64"	"147"
+				"windows"	"147"
+				"windows64"	"147"
+				"linux"		"148"
+				"linux64"	"148"
 			}
 			"EyeAngles"
 			{
-				"windows"	"137"
-				"windows64"	"137"
-				"linux"		"138"
-				"linux64"	"138"
+				"windows"	"138"
+				"windows64"	"138"
+				"linux"		"139"
+				"linux64"	"139"
 			}
 			"SetEntityModel"
 			{
@@ -102,10 +102,10 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"271"
-				"windows64"	"271"
-				"linux"		"272"
-				"linux64"	"272"
+				"windows"	"272"
+				"windows64"	"272"
+				"linux"		"273"
+				"linux64"	"273"
 			}
 			"Activate"
 			{
@@ -116,24 +116,24 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"430"
-				"windows64"	"430"
-				"linux"		"431"
-				"linux64"	"431"
+				"windows"	"431"
+				"windows64"	"431"
+				"linux"		"432"
+				"linux64"	"432"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"262"
-				"windows64"	"262"
-				"linux"		"263"
-				"linux64"	"263"
+				"windows"	"263"
+				"windows64"	"263"
+				"linux"		"264"
+				"linux64"	"264"
 			}
 			"GetAttachment"
 			{
-				"windows"	"215"
-				"windows64"	"215"
-				"linux"		"216"
-				"linux64"	"216"
+				"windows"	"216"
+				"windows64"	"216"
+				"linux"		"217"
+				"linux64"	"217"
 			}
 		}
 		
diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt
index dda5d3194..7a6a81fa3 100644
--- a/gamedata/sm-tf2.games.txt
+++ b/gamedata/sm-tf2.games.txt
@@ -160,26 +160,36 @@
 		}
 		"Offsets"
 		{
+			// CBasePlayer
 			"ForceRespawn"
 			{
-				"windows"	"336"
-				"windows64"	"336"
-				"linux"		"337"
-				"linux64"	"337"
+				"windows"	"337"
+				"windows64"	"337"
+				"linux"		"338"
+				"linux64"	"338"
 			}
+			"RemoveWearable"
+			{
+				"windows"	"440"
+				"windows64"	"440"
+				"linux"		"441"
+				"linux64"	"441"
+			}
+
+			// CTFWeaponBase
 			"CalcIsAttackCriticalHelper"
 			{
-				"windows"	"398"
-				"windows64"	"398"
-				"linux"		"405"
-				"linux64"	"405"
+				"windows"	"400"
+				"windows64"	"400"
+				"linux"		"407"
+				"linux64"	"407"
 			}
 			"CalcIsAttackCriticalHelperNoCrits"
 			{
-				"windows"	"399"
-				"windows64"	"399"
-				"linux"		"406"
-				"linux64"	"406"
+				"windows"	"401"
+				"windows64"	"401"
+				"linux"		"408"
+				"linux64"	"408"
 			}
 			
 			// CTFGameRules::IsHolidayActive
@@ -190,14 +200,6 @@
 				"linux"		"140"
 				"linux64"	"140"
 			}
-
-			"RemoveWearable"
-			{
-				"windows"	"439"
-				"windows64"	"439"
-				"linux"		"440"
-				"linux64"	"440"
-			}
 		}
 	}
 	
diff --git a/hl2sdk-manifests b/hl2sdk-manifests
index d8c250cd8..f559b1cc8 160000
--- a/hl2sdk-manifests
+++ b/hl2sdk-manifests
@@ -1 +1 @@
-Subproject commit d8c250cd80e284401e6579f2c669af768d6525ae
+Subproject commit f559b1cc8f9e47d88e13bd46a220c32ec26af7b6