diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt
index 8d1474f2b..7a6a81fa3 100644
--- a/gamedata/sm-tf2.games.txt
+++ b/gamedata/sm-tf2.games.txt
@@ -160,6 +160,7 @@
 		}
 		"Offsets"
 		{
+			// CBasePlayer
 			"ForceRespawn"
 			{
 				"windows"	"337"
@@ -167,19 +168,28 @@
 				"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"	"440"
-				"windows64"	"440"
-				"linux"		"441"
-				"linux64"	"441"
-			}
 		}
 	}
 	
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