diff --git a/gamedata/sdktools.games.ep2.txt b/gamedata/sdktools.games.ep2.txt
index dd0a21ab..c3e214ba 100644
--- a/gamedata/sdktools.games.ep2.txt
+++ b/gamedata/sdktools.games.ep2.txt
@@ -245,6 +245,36 @@
 			}
 		}
 	}
+	
+	/* SetUserInfo data */
+	"#default"
+	{
+		"Offsets"
+		{
+			/**
+			 * CBaseClient::SetUserCVar(char  const*,char  const*);
+			 * Linux offset straight from VTable dump.
+			 * Windows offset is crazy. Found the windows 'SetName' function using string "(%d)%-0.*s"
+			 * Cross referenced back to the vtable and counted manually (SetUserCvar is 1 higher, offsets start from 1)
+			 */
+			"SetUserCvar"
+			{
+				"windows"	"17"
+				"linux"		"55"
+			}
+			/**
+			 * Offset into CBaseClient - Used by CBaseServer::UpdateUserSettings to determine when changes have been made.
+			 * Find CBaseClient::UpdateUserSettings (strings "net_maxroutable", "cl_updaterate" etc) and the offset is set to 0 near the end.
+			 * Linux: 	mov     byte ptr [esi+98h], 0
+			 * Win:	mov     byte ptr [esi+0A4h], 0
+			 */
+			"InfoChanged"
+			{
+				"windows"	"164"
+				"linux"		"152"
+			}
+		}
+	}
 
 	/* Team Fortress 2 */
 	"tf"
@@ -331,23 +361,23 @@
 		{
 			"RemovePlayerItem"
 			{
-				"windows"	"237"
-				"linux"		"238"
+				"windows"	"238"
+				"linux"		"239"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"235"
-				"linux"		"236"
+				"windows"	"236"
+				"linux"		"237"
 			}
 			"Ignite"
 			{
-				"windows"	"192"
-				"linux"		"193"
+				"windows"	"193"
+				"linux"		"194"
 			}
 			"Extinguish"
 			{
-				"windows"	"196"
-				"linux"		"197"
+				"windows"	"197"
+				"linux"		"198"
 			}
 			"Teleport"
 			{
@@ -356,18 +386,18 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"386"
-				"linux"		"386"
+				"windows"	"388"
+				"linux"		"388"
 			}
 			"GetVelocity"
 			{
-				"windows"	"129"
-				"linux"		"130"
+				"windows"	"130"
+				"linux"		"131"
 			}
 			"EyeAngles"
 			{
-				"windows"	"121"
-				"linux"		"122"
+				"windows"	"122"
+				"linux"		"123"
 			}
 			"AcceptInput"
 			{
@@ -396,8 +426,8 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"228"
-				"linux"		"229"
+				"windows"	"229"
+				"linux"		"230"
 			}
 			"Activate"
 			{
@@ -406,34 +436,4 @@
 			}
 		}
 	}
-
-	/* SetUserInfo data */
-	"#default"
-	{
-		"Offsets"
-		{
-			/**
-			 * CBaseClient::SetUserCVar(char  const*,char  const*);
-			 * Linux offset straight from VTable dump.
-			 * Windows offset is crazy. Found the windows 'SetName' function using string "(%d)%-0.*s"
-			 * Cross referenced back to the vtable and counted manually (SetUserCvar is 1 higher, offsets start from 1)
-			 */
-			"SetUserCvar"
-			{
-				"windows"	"17"
-				"linux"		"55"
-			}
-			/**
-			 * Offset into CBaseClient - Used by CBaseServer::UpdateUserSettings to determine when changes have been made.
-			 * Find CBaseClient::UpdateUserSettings (strings "net_maxroutable", "cl_updaterate" etc) and the offset is set to 0 near the end.
-			 * Linux: 	mov     byte ptr [esi+98h], 0
-			 * Win:	mov     byte ptr [esi+0A4h], 0
-			 */
-			"InfoChanged"
-			{
-				"windows"	"164"
-				"linux"		"152"
-			}
-		}
-	}
 }
diff --git a/gamedata/sdktools.games.txt b/gamedata/sdktools.games.txt
index 8002b203..d72dcc30 100644
--- a/gamedata/sdktools.games.txt
+++ b/gamedata/sdktools.games.txt
@@ -248,6 +248,77 @@
 			}
 		}
 	}
+	
+	/* EntityFactoryDictionary function */
+	"#default"
+	{
+		"Signatures"
+		{
+			"EntityFactory"
+			{
+				"library"	"server"
+				"windows"	"\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
+				"linux"		"@_Z23EntityFactoryDictionaryv"
+			}
+		}
+	}
+	/* CBaseEntityOutput::FireOutput */
+	"#default"
+	{
+		"#supported"
+		{
+			"game"		"cstrike"
+			"game"		"dod"
+			"game"		"hl2mp"
+		}
+		"Signatures"
+		{
+			"FireOutput"
+			{
+				"library"	"server"
+				"windows"	"\x81\xEC\x1C\x03\x00\x00\x53\x55\x56\x8B\x71\x14"
+				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
+			}
+		}
+		"Offsets"
+		{
+			"FireOutputBackup"
+			{
+				"windows"	"6"
+				"linux"		"6"
+			}
+		}
+	}
+
+	/* SetUserInfo data */
+	"#default"
+	{
+		"Offsets"
+		{
+			/**
+			 * CBaseClient::SetUserCVar(char  const*,char  const*);
+			 * Linux offset straight from VTable dump.
+			 * Windows offset is crazy. Found the windows 'SetName' function using string "(%d)%-0.*s"
+			 * Cross referenced back to the vtable and counted manually (SetUserCvar is 1 higher, offsets start from 1)
+			 */
+			"SetUserCvar"
+			{
+				"windows"	"17"
+				"linux"		"53"
+			}
+			/**
+			 * Offset into CBaseClient - Used by CBaseServer::UpdateUserSettings to determine when changes have been made.
+			 * Find CBaseClient::UpdateUserSettings (strings "net_maxroutable", "cl_updaterate" etc) and the offset is set to 0 near the end.
+			 * Linux: 	mov     byte ptr [esi+98h], 0
+			 * Win:	mov     byte ptr [esi+0A4h], 0
+			 */
+			"InfoChanged"
+			{
+				"windows"	"164"
+				"linux"		"152"
+			}
+		}
+	}
 
 	/* Counter-Strike: Source */
 	"cstrike"
@@ -1818,75 +1889,5 @@
 			} 
 		}
 	}
-
-	/* EntityFactoryDictionary function */
-	"#default"
-	{
-		"Signatures"
-		{
-			"EntityFactory"
-			{
-				"library"	"server"
-				"windows"	"\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
-				"linux"		"@_Z23EntityFactoryDictionaryv"
-			}
-		}
-	}
-	/* CBaseEntityOutput::FireOutput */
-	"#default"
-	{
-		"#supported"
-		{
-			"game"		"cstrike"
-			"game"		"hl2mp"
-		}
-		"Signatures"
-		{
-			"FireOutput"
-			{
-				"library"	"server"
-				"windows"	"\x81\xEC\x1C\x03\x00\x00\x53\x55\x56\x8B\x71\x14"
-				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
-			}
-		}
-		"Offsets"
-		{
-			"FireOutputBackup"
-			{
-				"windows"	"6"
-				"linux"		"6"
-			}
-		}
-	}
-
-	/* SetUserInfo data */
-	"#default"
-	{
-		"Offsets"
-		{
-			/**
-			 * CBaseClient::SetUserCVar(char  const*,char  const*);
-			 * Linux offset straight from VTable dump.
-			 * Windows offset is crazy. Found the windows 'SetName' function using string "(%d)%-0.*s"
-			 * Cross referenced back to the vtable and counted manually (SetUserCvar is 1 higher, offsets start from 1)
-			 */
-			"SetUserCvar"
-			{
-				"windows"	"17"
-				"linux"		"53"
-			}
-			/**
-			 * Offset into CBaseClient - Used by CBaseServer::UpdateUserSettings to determine when changes have been made.
-			 * Find CBaseClient::UpdateUserSettings (strings "net_maxroutable", "cl_updaterate" etc) and the offset is set to 0 near the end.
-			 * Linux: 	mov     byte ptr [esi+98h], 0
-			 * Win:	mov     byte ptr [esi+0A4h], 0
-			 */
-			"InfoChanged"
-			{
-				"windows"	"164"
-				"linux"		"152"
-			}
-		}
-	}
 }