diff --git a/engine.h b/engine.h
index cd9fa6c..5a248b0 100644
--- a/engine.h
+++ b/engine.h
@@ -7,7 +7,7 @@
 #define FULLENGINENAME		"Rad-Therapy"
 #define GAME_SHORTNAME		"HL"
 #define GAME_BASEGAMES		"valve"
-#define GAME_PROTOCOL		"FTE-HalfLife"
+#define GAME_PROTOCOL		"FTE-RadTherapy"
 
 #define BRANDING_ICON "freecs.ico"
 #define DISTRIBUTION "FHL"
diff --git a/src/shared/HLWeapon.qc b/src/shared/HLWeapon.qc
index c333ff1..edf4372 100644
--- a/src/shared/HLWeapon.qc
+++ b/src/shared/HLWeapon.qc
@@ -51,7 +51,7 @@ HLWeapon::AddedToInventory(void)
 		m_ammoIcon = sprintf("%s.ammo", strtolower(classname));
 	}
 
-	m_ammo2Icon = GetDefString("ammoIcon");
+	m_ammo2Icon = GetDefString("ammo2Icon");
 
 	if (m_ammo2Icon == "") {
 		m_ammo2Icon = sprintf("%s.ammo2", strtolower(classname));
diff --git a/zpak001.pk3dir/decls/def/activities.def b/zpak001.pk3dir/decls/def/activities.def
new file mode 100644
index 0000000..5897da6
--- /dev/null
+++ b/zpak001.pk3dir/decls/def/activities.def
@@ -0,0 +1,79 @@
+entityDef activities {
+	"act_reset"			"0"
+	"act_idle"			"1"
+	"act_guard"			"2"
+	"act_walk"			"3"
+	"act_run"			"4"
+	"act_fly"			"5"
+	"act_swim"			"6"
+	"act_hop"			"7"
+	"act_leap"			"8"
+	"act_fall"			"9"
+	"act_land"			"10"
+	"act_strafeLeft"		"11"
+	"act_strafeRight"		"12"
+	"act_rollLeft"			"13"
+	"act_rollRight"			"14"
+	"act_turnLeft"			"15"
+	"act_turnRight"			"16"
+	"act_crouch"			"17"
+	"act_crouchIdle"		"18"
+	"act_stand"			"19"
+	"act_use"			"20"
+	"act_signal1"			"21"
+	"act_signal2"			"22"
+	"act_signal3"			"23"
+	"act_twitch"			"24"
+	"act_cower"			"25"
+	"act_smallFlinch"		"26"
+	"act_bigFlinch"			"27"
+	"act_rangeAttack1"		"28"
+	"act_rangeAttack2"		"29"
+	"act_meleeAttack1"		"30"
+	"act_meleeAttack2"		"31"
+	"act_reload"			"32"
+	"act_arm"			"33"
+	"act_disarm"			"34"
+	"act_eat"			"35"
+	"act_dieSimple"			"36"
+	"act_dieBackward"		"37"
+	"act_dieForward"		"38"
+	"act_dieViolent"		"39"
+	"act_barnacleHit"		"40"
+	"act_barnaclePull"		"41"
+	"act_barnacleChomp"		"42"
+	"act_barnacleChew"		"43"
+	"act_sleep"			"44"
+	"act_inspectFloor"		"45"
+	"act_inspectWall"		"46"
+	"act_idleAngry"			"47"
+	"act_walkHurt"			"48"
+	"act_runHurt"			"49"
+	"act_hover"			"50"
+	"act_glide"			"51"
+	"act_flyLeft"			"52"
+	"act_flyRight"			"53"
+	"act_detectScent"		"54"
+	"act_sniff"			"55"
+	"act_bite"			"56"
+	"act_threatDisplay"		"57"
+	"act_fearDisplay"		"58"
+	"act_excited"			"59"
+	"act_specialAttack1"		"60"
+	"act_specialAttack2"		"61"
+	"act_combatIdle"		"62"
+	"act_walkScared"		"63"
+	"act_runScared"			"64"
+	"act_victoryDance"		"65"
+	"act_dieHeadshot"		"66"
+	"act_dieChestshot"		"67"
+	"act_dieHutshot"		"68"
+	"act_dieBackshot"		"69"
+	"act_flinchHead"		"70"
+	"act_flinchChest"		"71"
+	"act_flinchStomach"		"72"
+	"act_flinchLeftArm"		"73"
+	"act_flinchRightArm"		"74"
+	"act_flinchLeftLeg"		"75"
+	"act_flinchRightLeg"		"76"
+}
diff --git a/zpak001.pk3dir/decls/def/items.def b/zpak001.pk3dir/decls/def/items.def
index 1e1c95e..1e52308 100644
--- a/zpak001.pk3dir/decls/def/items.def
+++ b/zpak001.pk3dir/decls/def/items.def
@@ -1,33 +1,3 @@
-entityDef item_battery
-{
-	"spawnclass"	"NSItem"
-	"model"			"models/w_battery.mdl"
-	"mins"			"-16 -16 0"
-	"maxs"			"16 16 16"
-	"snd_acquire"	"item.battery"
-	"snd_respawn"	"item.respawn"
-	"inv_armor"		"skill:battery"
-	"requires"		"item_suit"
-}
-
-entityDef item_healthkit
-{
-	"spawnclass"	"NSItem"
-	"model"			"models/w_medkit.mdl"
-	"mins"			"-16 -16 0"
-	"maxs"			"16 16 16"
-	"snd_acquire"	"item.healthkit"
-	"snd_respawn"	"item.respawn"
-	"inv_health"	"skill:healthkit"
-}
-
-entityDef item_suit
-{
-	"spawnclass"	"NSItem"
-	"model"			"models/w_suit.mdl"
-	"mins"			"-16 -16 0"
-	"maxs"			"16 16 16"
-	"snd_acquire"	"item.suit"
-	"snd_respawn"	"item.respawn"
-	"inv_carry"		"1"
-}
+#include "items/battery.def"
+#include "items/healthkit.def"
+#include "items/suit.def"
diff --git a/zpak001.pk3dir/decls/def/items/battery.def b/zpak001.pk3dir/decls/def/items/battery.def
new file mode 100644
index 0000000..df54600
--- /dev/null
+++ b/zpak001.pk3dir/decls/def/items/battery.def
@@ -0,0 +1,11 @@
+entityDef item_battery
+{
+	"spawnclass"	"NSItem"
+	"model"			"models/w_battery.mdl"
+	"mins"			"-16 -16 0"
+	"maxs"			"16 16 16"
+	"snd_acquire"	"item.battery"
+	"snd_respawn"	"item.respawn"
+	"inv_armor"		"skill:battery"
+	"requires"		"item_suit"
+}
diff --git a/zpak001.pk3dir/decls/def/items/healthkit.def b/zpak001.pk3dir/decls/def/items/healthkit.def
new file mode 100644
index 0000000..ede04b6
--- /dev/null
+++ b/zpak001.pk3dir/decls/def/items/healthkit.def
@@ -0,0 +1,10 @@
+entityDef item_healthkit
+{
+	"spawnclass"	"NSItem"
+	"model"			"models/w_medkit.mdl"
+	"mins"			"-16 -16 0"
+	"maxs"			"16 16 16"
+	"snd_acquire"	"item.healthkit"
+	"snd_respawn"	"item.respawn"
+	"inv_health"	"skill:healthkit"
+}
diff --git a/zpak001.pk3dir/decls/def/items/suit.def b/zpak001.pk3dir/decls/def/items/suit.def
new file mode 100644
index 0000000..85094a3
--- /dev/null
+++ b/zpak001.pk3dir/decls/def/items/suit.def
@@ -0,0 +1,10 @@
+entityDef item_suit
+{
+	"spawnclass"	"NSItem"
+	"model"			"models/w_suit.mdl"
+	"mins"			"-16 -16 0"
+	"maxs"			"16 16 16"
+	"snd_acquire"	"item.suit"
+	"snd_respawn"	"item.respawn"
+	"inv_carry"		"1"
+}
diff --git a/zpak001.pk3dir/decls/def/weapons/357.def b/zpak001.pk3dir/decls/def/weapons/357.def
index e2a2cdc..07a73e9 100644
--- a/zpak001.pk3dir/decls/def/weapons/357.def
+++ b/zpak001.pk3dir/decls/def/weapons/357.def
@@ -17,11 +17,17 @@ entityDef weapon_357
 	"inv_name"		".357 Revolver"
 	"clipSize"		"6"
 
-	"actFire"		"2"
-	"actHolster"	"4"
-	"actReload"		"3"
-	"actDraw"		"5"
-	"actIdle"		"0,1,6,7"
+	"ammoIcon"			"weapon_357.ammo"
+	"ammo2Icon"			"weapon_357.ammo2"
+	"crosshair"			"weapon_357.crosshair"
+	"icon"				"weapon_357.weapon"
+	"iconSelected"		"weapon_357.weapon_s"
+
+	"act_fire"		"2"
+	"act_holster"	"4"
+	"act_reload"		"3"
+	"act_draw"		"5"
+	"act_idle"		"0,1,6,7"
 
 	"snd_fire"		"weapon_357.shoot"
 	"snd_empty"		"weapon_357.empty"
@@ -36,7 +42,7 @@ entityDef weapon_357
 
 entityDef weapon_python
 {
-	"spawnclass" "weapon_357"
+	"inherit" "weapon_357"
 }
 
 entityDef projectile_357
@@ -55,3 +61,11 @@ entityDef fireInfo_357
 	"punchAngle"		"-10 0 0"
 	"model_flash"		"sprites/muzzleflash2.spr"
 }
+
+// multiplayer variant
+entityDef weapon_357_mp
+{
+	"inherit" 		"weapon_357"
+	"view_geomset"	"geomset 4 2\n"
+	"zoomFov"		"45"
+}
diff --git a/zpak001.pk3dir/decls/def/weapons/9mmAR.def b/zpak001.pk3dir/decls/def/weapons/9mmAR.def
index 54d1b05..fb08941 100644
--- a/zpak001.pk3dir/decls/def/weapons/9mmAR.def
+++ b/zpak001.pk3dir/decls/def/weapons/9mmAR.def
@@ -19,11 +19,17 @@ entityDef weapon_9mmAR
 	"clipSize"			"50"
 	"clipSizeDefault"	"25"
 
-	"actFire"		"5,6,7"
-	"actHolster"	"4"
-	"actReload"		"3"
-	"actDraw"		"4"
-	"actIdle"		"0,1"
+	"ammoIcon"			"weapon_9mmar.ammo"
+	"ammo2Icon"			"weapon_9mmar.ammo2"
+	"crosshair"			"weapon_9mmar.crosshair"
+	"icon"				"weapon_9mmar.weapon"
+	"iconSelected"		"weapon_9mmar.weapon_s"
+
+	"act_fire"		"5,6,7"
+	"act_holster"	"4"
+	"act_reload"		"3"
+	"act_draw"		"4"
+	"act_idle"		"0,1"
 
 	"snd_fire"		"weapon_mp5.shoot"
 	"snd_empty"		"weapon_mp5.empty"
@@ -61,7 +67,7 @@ entityDef fireInfo_ARGrenade
 	"fireRate"			"1"
 	"punchAngle"		"-10 0 0"
 	"snd_fire"			"weapon_mp5.gl"
-	"actFire"			"2"
+	"act_fire"			"2"
 }
 
 entityDef projectile_ARgrenade
diff --git a/zpak001.pk3dir/decls/def/weapons/9mmhandgun.def b/zpak001.pk3dir/decls/def/weapons/9mmhandgun.def
index be2c02f..3de7343 100644
--- a/zpak001.pk3dir/decls/def/weapons/9mmhandgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/9mmhandgun.def
@@ -22,15 +22,13 @@ entityDef weapon_9mmhandgun
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"3"
-	"actAltFire"		"3"
-	"actFireLast"		"4"
-	"actAltFireLast"	"4"
-	"actHolster"		"8"
-	"actReload"			"6"
-	"actReloadEmpty"	"5"
-	"actDraw"			"7"
-	"actIdle"			"0,1,2"
+	"act_fire"			"3"
+	"act_fireLast"		"4"
+	"act_holster"		"8"
+	"act_reload"			"6"
+	"act_reloadEmpty"	"5"
+	"act_draw"			"7"
+	"act_idle"			"0,1,2"
 
 	"snd_fire"		"weapon_glock.fire"
 	"snd_altfire"	"weapon_glock.fire"
diff --git a/zpak001.pk3dir/decls/def/weapons/crossbow.def b/zpak001.pk3dir/decls/def/weapons/crossbow.def
index 8cabd68..86dca6b 100644
--- a/zpak001.pk3dir/decls/def/weapons/crossbow.def
+++ b/zpak001.pk3dir/decls/def/weapons/crossbow.def
@@ -17,15 +17,21 @@ entityDef weapon_crossbow
 	"inv_name"		"Crossbow"
 	"clipSize"		"5"
 
-	"actFire"			"4"
-	"actFireLast"		"6"
-	"actHolster"		"10"
-	"actHolsterEmpty"	"11"
-	"actReload"			"7"
-	"actDraw"			"8"
-	"actDrawEmpty"		"9"
-	"actIdle"			"0,2"
-	"actIdleEmpty"		"1,3"
+	"ammoIcon"			"weapon_crossbow.ammo"
+	"ammo2Icon"			"weapon_crossbow.ammo2"
+	"crosshair"			"weapon_crossbow.crosshair"
+	"icon"				"weapon_crossbow.weapon"
+	"iconSelected"		"weapon_crossbow.weapon_s"
+
+	"act_fire"			"4"
+	"act_fireLast"		"6"
+	"act_holster"		"10"
+	"act_holsterEmpty"	"11"
+	"act_reload"			"7"
+	"act_draw"			"8"
+	"act_drawEmpty"		"9"
+	"act_idle"			"0,2"
+	"act_idleEmpty"		"1,3"
 
 	"snd_fire"		"weapon_crossbow.fire"
 	"snd_empty"		"weapon_crossbow.empty"
@@ -38,9 +44,15 @@ entityDef weapon_crossbow
 	"zoomFov"		"18"
 }
 
+entityDef weapon_crossbow_mp
+{
+	"inherit"		"weapon_crossbow"
+	"def_fireInfo"	"fireInfo_crossbowMP"
+}
+
 entityDef fireInfo_crossbow
 {
-	"def_onFire"	"projectile_arrow"
+	"def_onFire"		"projectile_arrow"
 	"ammoType"			"ammo_bolt"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
@@ -48,6 +60,12 @@ entityDef fireInfo_crossbow
 	"punchAngle"		"-2 0 0"
 }
 
+entityDef fireInfo_crossbowMP
+{
+	"inherit"		"fireInfo_crossbow"
+	"def_onFire"	"projectile_arrowExplosive"
+}
+
 entityDef debris_arrow
 {
 	"spawnclass"		"NSProjectile"
diff --git a/zpak001.pk3dir/decls/def/weapons/crowbar.def b/zpak001.pk3dir/decls/def/weapons/crowbar.def
index c6f5a69..446fbd1 100644
--- a/zpak001.pk3dir/decls/def/weapons/crowbar.def
+++ b/zpak001.pk3dir/decls/def/weapons/crowbar.def
@@ -13,23 +13,22 @@ entityDef weapon_crowbar
 	"snd_respawn"		"item.respawn"
 
 	// weapon specific
-	"def_melee"			"damage_crowbar"
-	"melee_distance"	"32"
+	"def_onFire"		"projectile_crowbar"
 	"inv_name"			"Crowbar"
-	"clipSize"			"6"
-	"ammoType"			""
 	"ammoRequired"		"0"
-	"clipSize"			"0"
 	"silent_fire"		"1"
 
-	"meleeRateMiss"		"0.5"
-	"meleeRateHit"		"0.25"
+	"testDistance"		"-32"
+	"failRate"			"0.5"
+	"fireRate"			"0.25"
+	"snd_fire"			"weapon_crowbar.hit"
+	"snd_fireFailed"	"weapon_crowbar.miss"
 
-	"actIdle"			"0"
-	"actDraw"			"1"
-	"actHolster"		"2"
-	"actMeleeMiss"		"4,5,7"
-	"actMeleeHit"		"3,6,8"
+	"act_idle"			"0"
+	"act_draw"			"1"
+	"act_holster"		"2"
+	"act_fireFailed"	"4,5,7"
+	"act_fire"			"3,6,8"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -39,14 +38,11 @@ entityDef weapon_crowbar
 	"ammoIcon"		"none"
 }
 
-entityDef damage_crowbar
+entityDef projectile_crowbar
 {
-	"damage"			"skill:plr_crowbar"
-//	"kickDir"			"-1 0 0"
-//	"knockback"			"20"
-//	"push"				"20000"
-	"gib"				"1"
-
-	"snd_hit"			"weapon_crowbar.hit"
-	"snd_miss"			"weapon_crowbar.miss"
+	"spawnclass"			"NSProjectile"
+	"damage"				"skill:plr_crowbar"
+	"is_bullet"				"1"
+	"decal_impact"			"Impact.Shot"
+	"detonate_on_world" 	"1"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/egon.def b/zpak001.pk3dir/decls/def/weapons/egon.def
index f523f51..8bb5452 100644
--- a/zpak001.pk3dir/decls/def/weapons/egon.def
+++ b/zpak001.pk3dir/decls/def/weapons/egon.def
@@ -17,11 +17,11 @@ entityDef weapon_egon
 	"inv_ammo_uranium"	"20"
 	"ammoType"			"ammo_uranium"
 	"ammoRequired"		"1"
-	"actIdle"			"0,1"
-	"actDraw"			"9"
-	"actLoop"			"7,8"
-	"actFireEnd"		"1"
-	"actHolster"		"10"
+	"act_idle"			"0,1"
+	"act_draw"			"9"
+	"act_loop"			"7,8"
+	"act_fireEnd"		"1"
+	"act_holster"		"10"
 	"fireRate"			"0.2"
 
 	"snd_fireStart"		"weapon_egon.fire"
diff --git a/zpak001.pk3dir/decls/def/weapons/gauss.def b/zpak001.pk3dir/decls/def/weapons/gauss.def
index 0b9bae8..f0d89f2 100644
--- a/zpak001.pk3dir/decls/def/weapons/gauss.def
+++ b/zpak001.pk3dir/decls/def/weapons/gauss.def
@@ -18,9 +18,9 @@ entityDef weapon_gauss
 	"inv_ammo_uranium"	"20"
 	"ammoType"			"ammo_uranium"
 	"ammoRequired"		"1"
-	"actIdle"			"0,1,2"
-	"actDraw"			"8"
-	"actHolster"		"7"
+	"act_idle"			"0,1,2"
+	"act_draw"			"8"
+	"act_holster"		"7"
 	"powerAmmo"			"1"
 	"snd_fire"			"weapon_gauss.fire"
 
@@ -48,7 +48,7 @@ entityDef fireInfo_gauss
 	"ammoPerShot" 		"2"
 	"fireRate" 			".2"
 	"punchAngle"		"-2 0 0"
-	"actFire"			"5,6"
+	"act_fire"			"5,6"
 	"model_flash"		"sprites/muzzleflash2.spr"
 }
 
@@ -64,8 +64,8 @@ entityDef fireInfo_gausscharge
 	"snd_fire"			"weapon_gauss.overcharge"
 	"snd_release"		"weapon_gauss.fire"
 	"chargeTime"		"5"
-	"actRelease"		"5,6"
-	"actDelay"			"3"
-	"actLoop"			"4"
+	"act_release"		"5,6"
+	"act_delay"			"3"
+	"act_loop"			"4"
 	"knockbackRelease"	"1024"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/handgrenade.def b/zpak001.pk3dir/decls/def/weapons/handgrenade.def
index 179fc0d..16ea385 100644
--- a/zpak001.pk3dir/decls/def/weapons/handgrenade.def
+++ b/zpak001.pk3dir/decls/def/weapons/handgrenade.def
@@ -17,19 +17,20 @@ entityDef weapon_handgrenade
 	"inv_weapon"			"weapon_handgrenade"
 	"inv_ammo_handgrenade"	"5"
 	"def_onRelease"			"projectile_handgrenade"
-	"def_explode_inhand"	"env_handgrenade_explodeinhand"
-	"def_damage_inhand"		"damage_handgrenadeSplash"
+	"def_onFire"			"projectile_handgrenade"
+
 	"ammoType"				"ammo_handgrenade"
 	"ammoRequired"			"1"
 	"silent_fire"			"1"
-	"primed_fuse"			"4"
+	"chargeTime"			"4"
 	"removeOnEmpty"			"1"
 
-	"actIdle"				"0,1"
-	"actDraw"				"7"
-	"actHolster"			"6"
-	"actFire"				"2"
-	"actRelease"			"3,4,5"
+	"act_idle"				"0,1"
+	"act_draw"				"7"
+	"act_holster"			"6"
+	"act_fire"				"2"
+	"act_delay"				"2"
+	"act_release"			"3,4,5"
 
 	// HLWeapon specific
 	"hudSlot"				"4"
@@ -44,6 +45,7 @@ entityDef projectile_handgrenade
 	"model"				"models/w_grenade.mdl"
 	"frame"				"1"
 	"fuse"				"4"
+	"thrown"			"1"
 	"detonate_on_fuse"	"1"
 	"bounce"			"1"
 	"angular_velocity"	"-350 0 0"
diff --git a/zpak001.pk3dir/decls/def/weapons/hornetgun.def b/zpak001.pk3dir/decls/def/weapons/hornetgun.def
index 5177c2a..5890655 100644
--- a/zpak001.pk3dir/decls/def/weapons/hornetgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/hornetgun.def
@@ -17,10 +17,10 @@ entityDef weapon_hornetgun
 	"inv_name"			"Hornet Gun"
 	"inv_ammo_hornet"	"8"
 
-	"actFire"		"5"
-	"actHolster"	"3"
-	"actDraw"		"4"
-	"actIdle"		"0,1,2"
+	"act_fire"		"5"
+	"act_holster"	"3"
+	"act_draw"		"4"
+	"act_idle"		"0,1,2"
 
 	"snd_fire"		"weapon_hornetgun.fire"
 
diff --git a/zpak001.pk3dir/decls/def/weapons/rpg.def b/zpak001.pk3dir/decls/def/weapons/rpg.def
index 208f1c4..6073b53 100644
--- a/zpak001.pk3dir/decls/def/weapons/rpg.def
+++ b/zpak001.pk3dir/decls/def/weapons/rpg.def
@@ -21,14 +21,14 @@ entityDef weapon_rpg
 	"inv_ammo_rocket"	"1"
 	"fireRate"			"2.5"
 
-	"actIdle"			"0,1"
-	"actIdleEmpty"		"8,9"
-	"actHolster"		"4"
-	"actHolsterEmpty"	"6"
-	"actDraw"		"5"
-	"actDrawEmpty"	"7"
-	"actFire"		"3"
-	"actReload"		"2"
+	"act_idle"			"0,1"
+	"act_idleEmpty"		"8,9"
+	"act_holster"		"4"
+	"act_holsterEmpty"	"6"
+	"act_draw"		"5"
+	"act_drawEmpty"	"7"
+	"act_fire"		"3"
+	"act_reload"		"2"
 
 	// HLWeapon specific
 	"hudSlot"		"3"
diff --git a/zpak001.pk3dir/decls/def/weapons/satchel.def b/zpak001.pk3dir/decls/def/weapons/satchel.def
index 9aa356d..6da0f79 100644
--- a/zpak001.pk3dir/decls/def/weapons/satchel.def
+++ b/zpak001.pk3dir/decls/def/weapons/satchel.def
@@ -20,9 +20,9 @@ entityDef weapon_satchel
 	"fireRate"			"1.0"
 	"removeOnEmpty" "1"
 
-	"actIdle"			"0,1"
-	"actDraw"			"2"
-	"actFire"			"3"
+	"act_idle"			"0,1"
+	"act_draw"			"2"
+	"act_fire"			"3"
 
 	// HLWeapon specific
 	"hudSlot"		"4"
diff --git a/zpak001.pk3dir/decls/def/weapons/shotgun.def b/zpak001.pk3dir/decls/def/weapons/shotgun.def
index a90641e..ee3a906 100644
--- a/zpak001.pk3dir/decls/def/weapons/shotgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/shotgun.def
@@ -20,14 +20,21 @@ entityDef weapon_shotgun
 	"inv_ammo_buckshot"	"4"
 	"ammoType"			"ammo_buckshot"
 	"ammoRequired"		"1"
+	"model_flash"		"sprites/muzzleflash2.spr"
 
-	"actFire"			"1"
-	"actHolster"		"7"
-	"actReloadStart"	"5"
-	"actReload"			"3"
-	"actReloadEnd"		"4"
-	"actDraw"			"6"
-	"actIdle"			"0,8,9"
+	"ammoIcon"			"weapon_shotgun.ammo"
+	"ammo2Icon"			"weapon_shotgun.ammo2"
+	"crosshair"			"weapon_shotgun.crosshair"
+	"icon"				"weapon_shotgun.weapon"
+	"iconSelected"		"weapon_shotgun.weapon_s"
+
+	"act_fire"			"1"
+	"act_holster"		"7"
+	"act_reloadStart"	"5"
+	"act_reload"			"3"
+	"act_reloadEnd"		"4"
+	"act_draw"			"6"
+	"act_idle"			"0,8,9"
 
 	"snd_fire"			"weapon_shotgun.single"
 	"snd_empty"			"weapon_shotgun.empty"
@@ -63,7 +70,6 @@ entityDef fireInfo_shotgun
 	"ammoPerShot"		"1"
 	"fireRate"			"0.75"
 	"punchAngle"		"-5 0 0"
-	"model_flash"		"sprites/muzzleflash2.spr"
 }
 
 entityDef fireInfo_altShotgun
@@ -71,10 +77,9 @@ entityDef fireInfo_altShotgun
 	"def_onFire"	"projectile_shotgun_alt"
 	"ammoPerShot"		"2"
 	"fireRate"			"1.5"
-	"actFire"			"2"
+	"act_fire"			"2"
 	"punchAngle"		"-10 0 0"
 	"snd_fire"			"weapon_shotgun.double"
-	"model_flash"		"sprites/muzzleflash2.spr"
 }
 
 // multiplayer version
@@ -98,9 +103,8 @@ entityDef fireInfo_shotgun_mp
 {
 	"def_onFire"	"projectile_shotgun_mp"
 	"ammoPerShot"		"1"
-	"fireRate"			"1.25"
+	"fireRate"			"0.75"
 	"punchAngle"		"-5 0 0"
-	"model_flash"		"sprites/muzzleflash2.spr"
 }
 
 entityDef fireInfo_altShotgun_mp
@@ -109,7 +113,6 @@ entityDef fireInfo_altShotgun_mp
 	"ammoPerShot"		"2"
 	"fireRate"			"1.5"
 	"punchAngle"		"-10 0 0"
-	"model_flash"		"sprites/muzzleflash2.spr"
 }
 
 entityDef weapon_shotgun_mp
diff --git a/zpak001.pk3dir/decls/def/weapons/snark.def b/zpak001.pk3dir/decls/def/weapons/snark.def
index cf2fdf8..5aec8e5 100644
--- a/zpak001.pk3dir/decls/def/weapons/snark.def
+++ b/zpak001.pk3dir/decls/def/weapons/snark.def
@@ -22,10 +22,10 @@ entityDef weapon_snark
 	"silent_fire"			"1"
 	"primed_fuse"			"4"
 
-	"actIdle"		"0,1,2"
-	"actDraw"		"4"
-	"actHolster"	"3"
-	"actThrow"		"5"
+	"act_idle"		"0,1,2"
+	"act_draw"		"4"
+	"act_holster"	"3"
+	"act_throw"		"5"
 	"removeOnEmpty" "1"
 
 	// HLWeapon specific
diff --git a/zpak001.pk3dir/decls/def/weapons/tripmine.def b/zpak001.pk3dir/decls/def/weapons/tripmine.def
index c0df4da..ef5f1f4 100644
--- a/zpak001.pk3dir/decls/def/weapons/tripmine.def
+++ b/zpak001.pk3dir/decls/def/weapons/tripmine.def
@@ -14,20 +14,38 @@ entityDef weapon_tripmine
 	"frame"				"8"
 	"snd_acquire"		"weapon.pickup"
 	"snd_respawn"		"item.respawn"
-	"def_plant"			"monster_tripmine"
+
+	"def_fireInfo"		"fireInfo_tripminePlant"
 
 	"inv_ammo_tripmine"	"1"
 	"ammoType"			"ammo_tripmine"
 	"ammoRequired"		"1"
-	"actIdle"		"0,1,4"
-	"actFire"		"2,3"
-	"actDraw"		"6"
-	"actHolster"	"5"
-	"removeOnEmpty" "1"
+	"act_idle"			"0,1,4"
+	"act_fire"			"2,3"
+	"act_draw"			"6"
+	"act_holster"		"5"
+	"removeOnEmpty"		"1"
 
 	// HLWeapon specific
-	"hudSlot"		"4"
-	"hudSlotPos"	"2"
-	"weight"		"-10"
-	"crosshair"		"none"
+	"hudSlot"			"4"
+	"hudSlotPos"		"2"
+	"weight"			"-10"
+	"crosshair"			"none"
+}
+
+entityDef fireInfo_tripminePlant
+{
+	"def_onFire"		"projectile_tripmine"
+	"fireRate"			"0.5"
+	"testDistance"		"-64"
+}
+
+entityDef projectile_tripmine
+{
+	"spawnclass"		"NSAttack"
+	"def_plant"			"monster_tripmine"
+	"plant"				"1"
+	"plantOnGround"		"0"
+	"plantDistance"		"64"
+	"plantOffset"		"8"
 }
diff --git a/zpak001.pk3dir/scripts/maptweaks.txt b/zpak001.pk3dir/scripts/maptweaks.txt
index ca928f5..b8fb385 100644
--- a/zpak001.pk3dir/scripts/maptweaks.txt
+++ b/zpak001.pk3dir/scripts/maptweaks.txt
@@ -1,21 +1,12 @@
 mutliplayer
 {
 	when-cvar deathmatch equals 1
-	replace weapon_crowbar weapon_crowbar_mp 
 	replace weapon_357 weapon_357_mp 
-	replace weapon_python weapon_python_mp 
+	replace weapon_python weapon_357_mp 
 	replace weapon_9mmAR weapon_9mmAR_mp 
-	replace weapon_mp5 weapon_mp5_mp 
+	replace weapon_mp5 weapon_9mmAR_mp 
 	replace weapon_crossbow weapon_crossbow_mp 
-	replace weapon_egon weapon_egon_mp 
-	replace weapon_gauss weapon_gauss_mp 
-	replace weapon_handgrenade weapon_handgrenade_mp 
-	replace weapon_hornetgun weapon_hornetgun_mp 
-	replace weapon_rpg weapon_rpg_mp 
-	replace weapon_satchel weapon_satchel_mp 
 	replace weapon_shotgun weapon_shotgun_mp 
-	replace weapon_snark weapon_snark_mp 
-	replace weapon_tripmine weapon_tripmine_mp 
 }
 
 deprecated