diff --git a/dlls/hamsandwich/config/hamdata.ini b/dlls/hamsandwich/config/hamdata.ini
index 08bb342a..d06c5cf6 100644
--- a/dlls/hamsandwich/config/hamdata.ini
+++ b/dlls/hamsandwich/config/hamdata.ini
@@ -543,6 +543,46 @@
 	fvisible 56
 	fvecvisible 57
 	
+	player_jump 135
+	player_duck 136
+	player_prethink 137
+	player_postthink 138
+	player_shouldfadeondeath 69
+	player_impulsecommands 139
+	
+	item_addtoplayer 58
+	item_addduplicate 59
+	item_getiteminfo 61
+	item_candeploy 62
+	item_deploy 63
+	item_canholster 64
+	item_holster 65
+	item_updateiteminfo 66
+	item_preframe 67
+	item_postframe 68
+	item_drop 69
+	item_kill 70
+	item_attachtoplayer 71
+	item_primaryammoindex 72
+	item_secondaryammoindex 73
+	item_updateclientdata 74
+	item_getweaponptr 75
+	item_itemslot 60
+	
+	weapon_extractammo 76
+	weapon_extractclipammo 77
+	weapon_addweapon 78
+	weapon_playemptysound 79
+	weapon_resetemptysound 80
+	weapon_sendweaponanim 81
+	weapon_isusable 82
+	weapon_primaryattack 83
+	weapon_secondaryattack 84
+	weapon_reload 85
+	weapon_weaponidle 86
+	weapon_retireweapon 87
+	weapon_shouldweaponidle 88
+
 	tfc_engineeruse 58
 	tfc_finished 59
 	tfc_empexplode 60
@@ -593,7 +633,6 @@
 	isinworld 37
 	isplayer 38
 	isnetclient 39
-	tfc_dbgetitemname 40
 	getnexttarget 41
 	think 42
 	touch 43
@@ -609,6 +648,47 @@
 	illumination 53
 	fvisible 54
 	fvecvisible 55
+	
+	player_jump 133
+	player_duck 134
+	player_prethink 135
+	player_postthink 136
+	player_shouldfadeondeath 67
+	player_impulsecommands 137
+	
+	item_addtoplayer 56
+	item_addduplicate 57
+	item_getiteminfo 59
+	item_candeploy 60
+	item_deploy 61
+	item_canholster 62
+	item_holster 63
+	item_updateiteminfo 64
+	item_preframe 65
+	item_postframe 66
+	item_drop 67
+	item_kill 68
+	item_attachtoplayer 69
+	item_primaryammoindex 70
+	item_secondaryammoindex 71
+	item_updateclientdata 72
+	item_getweaponptr 73
+	item_itemslot 58
+	
+	weapon_extractammo 74
+	weapon_extractclipammo 75
+	weapon_addweapon 76
+	weapon_playemptysound 77
+	weapon_resetemptysound 78
+	weapon_sendweaponanim 79
+	weapon_isusable 80
+	weapon_primaryattack 81
+	weapon_secondaryattack 82
+	weapon_reload 83
+	weapon_weaponidle 84
+	weapon_retireweapon 85
+	weapon_shouldweaponidle 86
+
 	tfc_engineeruse 56
 	tfc_finished 57
 	tfc_empexplode 58
@@ -634,9 +714,7 @@
 	traceattack 11
 	takedamage 12
 	takehealth 13
-	ns_getpointvalue 14
 	killed 15
-	ns_awardkill 16
 	bloodcolor 17
 	tracebleed 18
 	istriggered 19
@@ -665,13 +743,11 @@
 	isplayer 42
 	isnetclient 43
 	teamid 44
-	ns_resetentity 46
 	getnexttarget 47
 	think 48
 	touch 49
 	use 50
 	blocked 51
-	ns_updateonremove 52
 	respawn 53
 	updateowner 54
 	fbecomeprone 55
@@ -682,6 +758,54 @@
 	illumination 60
 	fvisible 61
 	fvecvisible 62
+	
+	player_jump 84
+	player_duck 85
+	player_prethink 86
+	player_postthink 87
+	player_getgunposition 88
+	player_shouldfadeondeath 73
+	player_impulsecommands 102
+	player_updateclientdata 100
+	
+	item_addtoplayer 65
+	item_addduplicate 66
+	item_getiteminfo 69
+	item_candeploy 70
+	item_deploy 71
+	item_canholster 72
+	item_holster 73
+	item_updateiteminfo 75
+	item_preframe 76
+	item_postframe 77
+	item_drop 78
+	item_kill 79
+	item_attachtoplayer 80
+	item_primaryammoindex 81
+	item_secondaryammoindex 82
+	item_updateclientdata 83
+	item_getweaponptr 84
+	item_itemslot 85
+	
+	weapon_extractammo 86
+	weapon_extractclipammo 87
+	weapon_addweapon 88
+	weapon_playemptysound 89
+	weapon_resetemptysound 90
+	weapon_sendweaponanim 95
+	weapon_isusable 74
+	weapon_primaryattack 99
+	weapon_secondaryattack 100
+	weapon_reload 101
+	weapon_weaponidle 102
+	weapon_retireweapon 103
+	weapon_shouldweaponidle 104
+	weapon_usedecrement 105
+	
+	ns_getpointvalue 14
+	ns_awardkill 16
+	ns_resetentity 46
+	ns_updateonremove 52
 @end
 @section ns windows
 	pev 4
@@ -698,9 +822,7 @@
 	traceattack 10
 	takedamage 11
 	takehealth 12
-	ns_getpointvalue 13
 	killed 14
-	ns_awardkill 15
 	bloodcolor 16
 	tracebleed 17
 	istriggered 18
@@ -729,13 +851,11 @@
 	isplayer 41
 	isnetclient 42
 	teamid 43
-	ns_resetentity 45
 	getnexttarget 46
 	think 47
 	touch 48
 	use 49
 	blocked 50
-	ns_updateonremove 51
 	respawn 52
 	updateowner 53
 	fbecomeprone 54
@@ -746,15 +866,60 @@
 	illumination 59
 	fvisible 60
 	fvecvisible 61
+	
+	player_jump 83
+	player_duck 84
+	player_prethink 85
+	player_postthink 86
+	player_getgunposition 87
+	player_shouldfadeondeath 72
+	player_impulsecommands 101
+	player_updateclientdata 99
+	
+	item_addtoplayer 64
+	item_addduplicate 65
+	item_getiteminfo 68
+	item_candeploy 69
+	item_deploy 70
+	item_canholster 71
+	item_holster 72
+	item_updateiteminfo 74
+	item_preframe 75
+	item_postframe 76
+	item_drop 77
+	item_kill 78
+	item_attachtoplayer 79
+	item_primaryammoindex 80
+	item_secondaryammoindex 81
+	item_updateclientdata 82
+	item_getweaponptr 83
+	item_itemslot 84
+	
+	weapon_extractammo 85
+	weapon_extractclipammo 86
+	weapon_addweapon 87
+	weapon_playemptysound 88
+	weapon_resetemptysound 89
+	weapon_sendweaponanim 94
+	weapon_isusable 73
+	weapon_primaryattack 98
+	weapon_secondaryattack 99
+	weapon_reload 100
+	weapon_weaponidle 101
+	weapon_retireweapon 102
+	weapon_shouldweaponidle 103
+	weapon_usedecrement 104
+	
+	ns_getpointvalue 13
+	ns_awardkill 15
+	ns_resetentity 45
+	ns_updateonremove 51
 @end
 
 @section ts linux
 	pev 0
 	base 0x60
 	
-	ts_breakablerespawn 2
-	ts_canusedthroughwalls 3
-	ts_respawnwait 4
 	spawn 5
 	precache 6
 	keyvalue 7
@@ -810,6 +975,54 @@
 	illumination 59
 	fvisible 60
 	fvecvisible 61
+
+	player_jump 79
+	player_duck 80
+	player_prethink 81
+	player_postthink 82
+	player_getgunposition 83
+	player_shouldfadeondeath 70
+	player_impulsecommands 85
+	player_updateclientdata 84
+	
+	item_addtoplayer 63
+	item_addduplicate 64
+	item_getiteminfo 65
+	item_candeploy 66
+	item_deploy 67
+	item_canholster 68
+	item_holster 69
+	item_updateiteminfo 70
+	item_preframe 71
+	item_postframe 72
+	item_drop 73
+	item_kill 74
+	item_attachtoplayer 75
+	item_primaryammoindex 76
+	item_secondaryammoindex 77
+	item_updateclientdata 78
+	item_getweaponptr 79
+	item_itemslot 80
+	
+	weapon_extractammo 81
+	weapon_extractclipammo 82
+	weapon_addweapon 83
+	weapon_playemptysound 84
+	weapon_resetemptysound 85
+	weapon_sendweaponanim 86
+	weapon_isusable 87
+	weapon_primaryattack 88
+	weapon_secondaryattack 89
+	weapon_reload 91
+	weapon_weaponidle 92
+	weapon_retireweapon 93
+	weapon_shouldweaponidle 94
+	weapon_usedecrement 95
+	
+	ts_breakablerespawn 2
+	ts_canusedthroughwalls 3
+	ts_respawnwait 4
+	ts_weapon_alternateattack 90
 @end
 @section ts windows
 	pev 4
@@ -873,6 +1086,54 @@
 	illumination 57
 	fvisible 58
 	fvecvisible 59
+
+	player_jump 77
+	player_duck 78
+	player_prethink 79
+	player_postthink 80
+	player_getgunposition 81
+	player_shouldfadeondeath 68
+	player_impulsecommands 83
+	player_updateclientdata 82
+	
+	item_addtoplayer 61
+	item_addduplicate 62
+	item_getiteminfo 63
+	item_candeploy 64
+	item_deploy 65
+	item_canholster 66
+	item_holster 67
+	item_updateiteminfo 68
+	item_preframe 69
+	item_postframe 70
+	item_drop 71
+	item_kill 72
+	item_attachtoplayer 73
+	item_primaryammoindex 74
+	item_secondaryammoindex 75
+	item_updateclientdata 76
+	item_getweaponptr 77
+	item_itemslot 78
+	
+	weapon_extractammo 79
+	weapon_extractclipammo 80
+	weapon_addweapon 81
+	weapon_playemptysound 82
+	weapon_resetemptysound 83
+	weapon_sendweaponanim 84
+	weapon_isusable 85
+	weapon_primaryattack 86
+	weapon_secondaryattack 87
+	weapon_reload 89
+	weapon_weaponidle 90
+	weapon_retireweapon 91
+	weapon_shouldweaponidle 92
+	weapon_usedecrement 93
+	
+	ts_breakablerespawn 0
+	ts_canusedthroughwalls 1
+	ts_respawnwait 2
+	ts_weapon_alternateattack 88
 @end
 
 ; Sven-Coop has no linux binaries.  This makes disassembly much harder.