diff --git a/decls/def/weapons/9mmAR.def b/decls/def/weapons/9mmAR.def
deleted file mode 100644
index 9f65aed..0000000
--- a/decls/def/weapons/9mmAR.def
+++ /dev/null
@@ -1,98 +0,0 @@
-entityDef weapon_9mmAR
-{
-	"editor_color"		".3 .3 1"
-	"editor_mins"		"-16 -16 -16"
-	"editor_maxs"		"16 16 16"
-	"editor_usage"		"9mm AR"
-	"editor_rotatable"	"1"
-
-	"spawnclass"		"HLWeapon"
-	"model"				"models/w_9mmAR.mdl"
-	"model_view"		"models/v_9mmAR.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
-
-	// NSWeapon specific
-	"def_fireInfo"		"fireInfo_9mmAR"
-	"def_altFireInfo"	"fireInfo_ARGrenade"
-	"inv_name"			"9mm AR"
-	"clipSize"			"50"
-	"clipSizeDefault"	"25"
-
-	"actFire"		"6,7,8"
-	"actAltFire"	"2"
-	"actHolster"	"4"
-	"actReload"		"3"
-	"actDraw"		"4"
-	"actIdle"		"0,1"
-
-	"snd_fire"		"weapon_mp5.shoot"
-	"snd_altfire"	"weapon_mp5.gl"
-	"snd_empty"		"weapon_mp5.empty"
-
-	// HLWeapon specific
-	"hudSlot"		"2"
-	"hudSlotPos"	"0"
-	"weight"		"15"
-}
-
-entityDef projectile_9mmAR
-{
-	"damage"	"skill:9mmAR_bullet"
-}
-
-entityDef fireInfo_9mmAR
-{
-	"def_projectile"	"projectile_9mmAR"
-	"ammoType"			"ammo_9mm"
-	"ammoRequired"		"1"
-	"ammoPerShot"		"1"
-	"fireRate"			"0.085"
-	"punchAngle"		"-2 0 0"
-	"model_flash"		"sprites/muzzleflash1.spr"
-}
-
-entityDef fireInfo_ARGrenade
-{
-	"def_projectile"	"projectile_ARgrenade"
-	"ammoType"			"ammo_m203_grenade"
-	"ammoRequired"		"1"
-	"ammoPerShot"		"1"
-	"fireRate"			"1"
-	"punchAngle"		"-10 0 0"
-}
-
-entityDef projectile_ARgrenade
-{
-	"spawnclass"		"NSProjectile"
-	"model"				"models/grenade.mdl"
-	"offset"			"16 0 0"
-	"velocity"			"800 0 0"
-	"angular_velocity"	"-300 0 0"
-	"gravity"			"0.5"
-	"bounce"			"1"
-	"mins"				"0 0 0"
-	"maxs"				"0 0 0"
-	"detonate_on_fuse"	"0"
-	"detonate_on_death"	"1"
-	"detonate_on_world"	"1"
-	"detonate_on_actor"	"1"
-	"snd_explode"		"fx.explosion"
-	"model_detonate"	"fx_explosion.main"
-	"decal_detonate"	"ExplosionScorch"
-	"smoke_fly"			"weapon_9mmAR.nadetrail"
-
-	"def_damage"		"damage_ARgrenadeDirect"
-	"def_splash_damage"	"damage_ARgrenadeSplash"
-}
-
-entityDef damage_ARgrenadeDirect
-{
-	"damage"	"50"
-}
-
-entityDef damage_ARgrenadeSplash
-{
-	"damage"	"skill:plr_9mmAR_grenade"
-	"radius"	"160"
-}
diff --git a/decls/def/weapons/eagle.def b/decls/def/weapons/eagle.def
index 56ab6b3..9a1288b 100644
--- a/decls/def/weapons/eagle.def
+++ b/decls/def/weapons/eagle.def
@@ -1,3 +1,15 @@
+#define EAGLE_IDLE1 0
+#define EAGLE_IDLE2 1
+#define EAGLE_IDLE3 2
+#define EAGLE_IDLE4 3
+#define EAGLE_IDLE5 4
+#define EAGLE_FIRE 5
+#define EAGLE_FIRE_LAST 6
+#define EAGLE_RELOAD 7
+#define EAGLE_RELOAD_EMPTY 8
+#define EAGLE_DRAW 9
+#define EAGLE_HOLSTER 10
+
 entityDef weapon_eagle
 {
 	"editor_color"		".3 .3 1"
@@ -7,14 +19,13 @@ entityDef weapon_eagle
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_base"
 	"model"				"models/w_desert_eagle.mdl"
 	"model_view"		"models/v_desert_eagle.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 
 	// weapon specific
 	"def_fireInfo"		"fireInfo_eagle"
-	"def_altFireInfo"	"fireInfo_laser"
+	"def_altFireInfo"	"fireInfo_ealgeLaser"
 	"inv_name"			"Desert Eagle"
 	"clipSize"			"7"
 	"model_flash"		"sprites/muzzleflash2.spr"
@@ -23,41 +34,52 @@ entityDef weapon_eagle
 	"ammoPerShot"		"1"
 	"inv_ammo_357"		"7"
 
-	"actFire"			"5"
-	"actFireLast"		"6"
-	"actHolster"		"10"
-	"actReload"			"8"
-	"actReloadEmpty"	"7"
-	"actDraw"			"9"
-	"actIdle"			"0,1,2,3,4"
+	"ammoIcon"			"weapon_eagle.ammo"
+	"crosshair"			"weapon_eagle.crosshair"
+	"icon"				"weapon_eagle.weapon"
+	"iconSelected"		"weapon_eagle.weapon_s"
 
-	"snd_fire"		"weapon_eagle.shoot"
-	"snd_empty"		"weapon_eagle.empty"
-	"snd_reload"	"weapon_eagle.reload"
+	"altMode"			"1"
+
+	"act_fire"			"$EAGLE_FIRE"
+	"act_fireLast"		"$EAGLE_FIRE_LAST"
+	"act_holster"		"$EAGLE_HOLSTER"
+	"act_reload"		"$EAGLE_RELOAD"
+	"act_reloadEmpty"	"$EAGLE_RELOAD_EMPTY"
+	"act_draw"			"$EAGLE_DRAW"
+	"act_idle"			"$EAGLE_IDLE1,$EAGLE_IDLE2,$EAGLE_IDLE3,$EAGLE_IDLE4,$EAGLE_IDLE5"
+
+	"snd_fire"			"Weapon_Eagle.Single"
+	"snd_empty"			"Weapons.Empty"
+	"snd_modeOn"		"Weapon_Eagle.LaserOn"
+	"snd_modeOff"		"Weapon_Eagle.LaserOff"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
-	"hudSlotPos"	"1"
-	"weight"		"15"
-	"altLaser"		"1"
+	"hudSlot"			"1"
+	"hudSlotPos"		"2"
+	"weight"			"15"
+	"altLaser"			"1"
 }
 
 entityDef projectile_eagle
 {
-	"inherit"	"projectile_bullet_base"
-	"damage"	"skill:plr_eagle_bullet"
+	"inherit"			"projectile_bullet_base"
+	"damage"			"skill:plr_eagle_bullet"
 }
 
 entityDef fireInfo_eagle
 {
-	"def_projectile"	"projectile_eagle"
+	"def_onFire"		"projectile_eagle"
 	"fireRate"			"0.2"
 	"punchAngle"		"-10 0 0"
+	"spread"			"0.1 0.1"
 }
 
-entityDef fireInfo_laser
+// slower and more accurate
+entityDef fireInfo_eagleLaser
 {
-	"def_projectile"	"projectile_eagle"
-	"fireRate"			"0.5" // slower with laser on
+	"def_onFire"		"projectile_eagle"
+	"fireRate"			"0.5"
 	"punchAngle"		"-10 0 0"
-}
\ No newline at end of file
+	"spread"			"0 0"
+}
diff --git a/decls/def/weapons/gearbox_9mmAR.def b/decls/def/weapons/gearbox_9mmAR.def
new file mode 100644
index 0000000..3215964
--- /dev/null
+++ b/decls/def/weapons/gearbox_9mmAR.def
@@ -0,0 +1,14 @@
+entityDef weapon_gearbox_9mmAR
+{
+	"editor_color"		".3 .3 1"
+	"editor_mins"		"-16 -16 -16"
+	"editor_maxs"		"16 16 16"
+	"editor_usage"		"9mm AR (Opposing Force)"
+	"editor_rotatable"	"1"
+
+	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_9mmAR"
+
+	// sigh
+	"act_fire"		"6,7,8"
+}
diff --git a/decls/def/weapons/grapple.def b/decls/def/weapons/grapple.def
index 1697543..4f1e7fa 100644
--- a/decls/def/weapons/grapple.def
+++ b/decls/def/weapons/grapple.def
@@ -6,11 +6,9 @@ entityDef weapon_grapple
 	"editor_usage"		"Barnacle Grappling-Hook"
 	"editor_rotatable"	"1"
 
-	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_base"
 	"model"				"models/w_bgrap.mdl"
 	"model_view"		"models/v_bgrap.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 
 	// NSWeapon specific
 	"def_fireInfo"		"fireInfo_grapple"
diff --git a/decls/def/weapons/knife.def b/decls/def/weapons/knife.def
index 0bc432c..37ab194 100644
--- a/decls/def/weapons/knife.def
+++ b/decls/def/weapons/knife.def
@@ -1,49 +1,65 @@
+#define KNIFE_IDLE1 0
+#define KNIFE_DRAW 1
+#define KNIFE_HOLSTER 2
+#define KNIFE_HIT1 3
+#define KNIFE_FIRE1 4
+#define KNIFE_FIRE2 5
+#define KNIFE_HIT2 6
+#define KNIFE_FIRE3 7
+#define KNIFE_HIT3 8
+#define KNIFE_IDLE2 9
+#define KNIFE_IDLE3 10
+#define KNIFE_SECONDARY_FIRE1 11
+#define KNIFE_SECONDARY_HIT1 12
+
 entityDef weapon_knife
 {
-	"editor_color"			".3 .3 1"
-	"editor_mins"			"-16 -16 -16"
-	"editor_maxs"			"16 16 16"
-	"editor_usage"			"Knife"
-	"editor_rotatable"		"1"
+	"editor_color"		".3 .3 1"
+	"editor_mins"		"-16 -16 -16"
+	"editor_maxs"		"16 16 16"
+	"editor_usage"		"Combat Knife"
+	"editor_rotatable"	"1"
 
-	"spawnclass"			"HLWeapon"
-	"model"					"models/w_knife.mdl"
-	"model_view"			"models/v_knife.mdl"
-	"snd_acquire"			"weapon.pickup"
-	"snd_respawn"			"item.respawn"
+	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_base"
+	"model"				"models/w_knife.mdl"
+	"model_view"		"models/v_knife.mdl"
 
 	// weapon specific
-	"def_melee"				"damage_knife"
-	"melee_distance"		"32"
-	"inv_name"				"Knife"
-	"clipSize"				""
-	"ammoType"				""
-	"ammoRequired"			"0"
-	"clipSize"				"0"
-	"silent_fire"			"1"
+	"def_onFire"		"projectile_knife"
+	"inv_name"			"Combat Knife"
+	"ammoRequired"		"0"
+	"silent_fire"		"1"
 
-	"meleeRateMiss"			"0.5"
-	"meleeRateHit"			"0.25"
+	"testDistance"		"-32"
+	"failRate"			"0.5"
+	"fireRate"			"0.25"
+	"snd_fireFailed"	"Weapon_Knife.Single"
 
-	"actIdle"				"0,9,10"
-	"actDraw"				"1"
-	"actHolster"			"2"
-	"actMeleeMiss"			"4,6,8"
-	"actMeleeHit"			"3,5,7"
-	// "actMeleeAlt"		"11" // Cut secondary attack
-	// "actMeleeAltHit"		"12" // Cut secondary attack
+	"act_idle"			"$KNIFE_IDLE1,$KNIFE_IDLE2,$KNIFE_IDLE3"
+	"act_draw"			"$KNIFE_DRAW"
+	"act_holster"		"$KNIFE_HOLSTER"
+	"act_fireFailed"	"$KNIFE_FIRE1,$KNIFE_FIRE2,$KNIFE_FIRE3"
+	"act_fire"			"$KNIFE_HIT1,$KNIFE_HIT2,$KNIFE_HIT3"
+	// "act_fire"		"$KNIFE_SECONDARY_FIRE1" // Cut secondary attack
+	// "act_fireFailed"	"$KNIFE_SECONDARY_HIT1" // Cut secondary attack
 
 	// HLWeapon specific
-	"hudSlot"				"0"
-	"hudSlotPos"			"2"
-	"weight"				"0"
+	"hudSlot"		"0"
+	"hudSlotPos"	"2"
+	"weight"		"0"
+	"crosshair"		"none"
+	"ammoIcon"		"none"
 }
 
-entityDef damage_knife
+entityDef projectile_knife
 {
-	"damage"			"skill:plr_knife"
-	"gib"				"1"
-
-	"snd_hit"			"weapon_knife.hit"
-	"snd_miss"			"weapon_knife.miss"
+	"spawnclass"			"ncProjectile"
+	"damage"				"skill:plr_knife"
+	"is_bullet"				"1"
+	"range"					"32"
+	"decal_impact"			"Impact.Shot"
+	"detonate_on_world" 	"1"
+	"snd_hitBody"			"Weapon_Knife.Melee_Hit"
+	"snd_hitWorld"			"Weapon_Knife.Melee_HitWorld"
 }
diff --git a/decls/def/weapons/m249.def b/decls/def/weapons/m249.def
index 89f36b9..175d55c 100644
--- a/decls/def/weapons/m249.def
+++ b/decls/def/weapons/m249.def
@@ -1,3 +1,13 @@
+#define M249_IDLE_LONG 0
+#define M249_IDLE 1
+#define M249_RELOAD_START 2
+#define M249_RELOAD_END 3
+#define M249_HOLSTER 4
+#define M249_DRAW 5
+#define M249_FIRE1 6
+#define M249_FIRE2 7
+#define M249_FIRE3 8
+
 entityDef weapon_m249
 {
 	"editor_color"		".3 .3 1"
@@ -7,35 +17,41 @@ entityDef weapon_m249
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_base"
 	"model"				"models/w_saw.mdl"
 	"model_view"		"models/v_saw.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
+	"model_flash"		"sprites/muzzleflash1.spr"
 
 	// NSWeapon specific
 	"def_fireInfo"		"fireInfo_m249"
 	"inv_name"			"M249"
 	"clipSize"			"50"
 
-	"actFire"			"6,7,8"
-	"actHolster"		"4"
-	"actReload"			"2+3"
-	"actDraw"			"5"
-	"actIdle"			"0,1"
+	"ammoIcon"			"weapon_m249.ammo"
+	"crosshair"			"weapon_m249.crosshair"
+	"icon"				"weapon_m249.weapon"
+	"iconSelected"		"weapon_m249.weapon_s"
 
-	"snd_fire"			"weapon_m249.shoot"
-	"snd_empty"			"weapon_m249.empty"
+	"act_fire"			"$M249_FIRE1,$M249_FIRE2,$M249_FIRE3"
+	"act_holster"		"$M249_HOLSTER"
+	"act_reload"		"$M249_RELOAD_START"
+	"act_reloadEnd"		"$M249_RELOAD_END"
+	"act_draw"			"$M249_DRAW"
+	"act_idle"			"$M249_IDLE,$M249_IDLE_LONG"
+
+	"snd_fire"			"Weapon_M249.Single"
+	"snd_empty"			"Weapons.Empty"
 
 	// HLWeapon specific
-	"hudSlot"			"2"
+	"hudSlot"			"5"
 	"hudSlotPos"		"0"
 	"weight"			"15"
 }
 
 entityDef projectile_m249
 {
-	"inherit"		"projectile_bullet_base"
-	"damage"		"skill:m249_bullet"
+	"inherit"			"projectile_bullet_base"
+	"damage"			"skill:m249_bullet"
 }
 
 entityDef fireInfo_m249
@@ -48,5 +64,4 @@ entityDef fireInfo_m249
 	"fireRate"			"0.075"
 	"punchAngle"		"-2 0 0"
 	"knockback"			"64"
-	"model_flash"		"sprites/muzzleflash1.spr"
 }
diff --git a/decls/def/weapons/penguin.def b/decls/def/weapons/penguin.def
index 2ea7c8f..f76932d 100644
--- a/decls/def/weapons/penguin.def
+++ b/decls/def/weapons/penguin.def
@@ -7,25 +7,10 @@ entityDef weapon_penguin
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_snark"
 	"model"				"models/w_penguinnest.mdl"
 	"model_view"		"models/v_penguin.mdl"
 	"frame"				"1"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
-
-	"inv_name"			"Penguin"
-	"inv_weapon"		"weapon_penguin"
-	"inv_ammo_penguin"	"5"
-	"def_projectile"	"projectile_penguin"
-	"ammoType"			"ammo_penguin"
-	"ammoRequired"		"1"
-	"silent_fire"		"1"
-	"primed_fuse"		"4"
-
-	"actIdle"			"0,1,2"
-	"actDraw"			"4"
-	"actHolster"		"3"
-	"actThrow"			"5"
 
 	// HLWeapon specific
 	"hudSlot"			"4"
@@ -36,4 +21,4 @@ entityDef weapon_penguin
 entityDef projectile_penguin
 {
 	"spawnclass"		"monster_penguin"
-}
\ No newline at end of file
+}
diff --git a/decls/def/weapons/pipewrench.def b/decls/def/weapons/pipewrench.def
index 29ab428..c55695c 100644
--- a/decls/def/weapons/pipewrench.def
+++ b/decls/def/weapons/pipewrench.def
@@ -1,3 +1,19 @@
+#define PIPEWRENCH_IDLE1 0
+#define PIPEWRENCH_IDLE2 1
+#define PIPEWRENCH_IDLE3 2
+#define PIPEWRENCH_DRAW 3
+#define PIPEWRENCH_HOLSTER 4
+#define PIPEWRENCH_HIT1 5
+#define PIPEWRENCH_FIRE1 6
+#define PIPEWRENCH_HIT2 7
+#define PIPEWRENCH_FIRE2 8
+#define PIPEWRENCH_HIT3 9
+#define PIPEWRENCH_FIRE3 10
+#define PIPEWRENCH_SECONDARY_CHARGE 11
+#define PIPEWRENCH_SECONDARY_HIT1 12
+#define PIPEWRENCH_SECONDARY_FIRE1 13
+#define PIPEWRENCH_SECONDARY_LOOP 14
+
 entityDef weapon_pipewrench
 {
 	"editor_color"		".3 .3 1"
@@ -7,56 +23,77 @@ entityDef weapon_pipewrench
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
-	"model"			"models/w_pipe_wrench.mdl"
+	"inherit"			"weapon_base"
+	"model"				"models/w_pipe_wrench.mdl"
 	"model_view"		"models/v_pipe_wrench.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 
 	// weapon specific
-	"def_melee"		"damage_pipewrench"
-	//"def_meleeAlt"		"damage_charge" // TODO
-	"melee_distance"	"32"
-	"inv_name"		"Pipe Wrench"
-	"clipSize"		""
-	"ammoType"		""
+	"def_fireInfo"		"fireInfo_pipewrench"
+	"def_altFireInfo"	"fireInfo_pipewrenchCharge"
+	"inv_name"			"Pipe Wrench"
 	"ammoRequired"		"0"
-	"clipSize"		"0"
 	"silent_fire"		"1"
 
-	"meleeRateMiss"		"0.7"
-	"meleeRateHit"		"0.53"
+	"testDistance"		"-32"
+	"failRate"			"0.75"
+	"fireRate"			"0.5"
 
-	"actIdle"		"0,1,2"
-	"actDraw"		"3"
-	"actHolster"		"4"
-	"actMeleeMiss"		"6,8,10"
-	"actMeleeHit"		"5,7,9"
-	// "actMeleeAlt"		"11" // TODO
-	// "actMeleeAltHit"		"12" // TODO
-	// "actMeleeAltMiss"		"13" // TODO
+	"act_holster"		"$PIPEWRENCH_HOLSTER"
+	"act_draw"			"$PIPEWRENCH_DRAW"
+	"act_idle"			"$PIPEWRENCH_IDLE1,$PIPEWRENCH_IDLE2,$PIPEWRENCH_IDLE3"
 
 	// HLWeapon specific
-	"hudSlot"		"0"
+	"hudSlot"			"0"
 	"hudSlotPos"		"1"
-	"weight"		"0"
+	"weight"			"0"
+	"crosshair"			"none"
+	"ammoIcon"			"none"
 }
 
-entityDef damage_pipewrench
+entityDef fireInfo_pipewrench
 {
-	"damage"			"skill:plr_pipewrench"
-	"gib"				"1"
-
-	"snd_hit"			"weapon_pipewrench.hit"
-	"snd_miss"			"weapon_pipewrench.miss"
+	"def_onFire"		"projectile_pipewrench"
+	"punchAngle"		"-2 0 0"
+	"act_fire"			"$PIPEWRENCH_HIT1,$PIPEWRENCH_HIT2,$PIPEWRENCH_HIT3"
+	"act_fireFailed"	"$PIPEWRENCH_FIRE1,$PIPEWRENCH_FIRE2,$PIPEWRENCH_FIRE3"
+	"snd_fireFailed"	"Weapon_PipeWrench.Single"
 }
 
-
-// TODO
-entityDef damage_charge
+entityDef fireInfo_pipewrenchCharge
 {
-	"damage"			"skill:plr_pipewrench"
-	"gib"				"1"
-
-	"snd_hit"			"weapon_pipewrench.hit"
-	"snd_miss"			"weapon_pipewrench.miss"
+	"def_onFire"		"damage_pipewrenchCharge"
+	"def_onRelease"		"damage_pipewrenchCharge"
+	"punchAngle"		"-2 0 0"
+	"chargeTime"		"1.0"
+	"act_fireStart"		"$PIPEWRENCH_SECONDARY_CHARGE"
+	"act_fire"			"$PIPEWRENCH_SECONDARY_HIT1"
+	"act_fireFailed"	"$PIPEWRENCH_SECONDARY_FIRE1"
+	"act_loop"			"$PIPEWRENCH_SECONDARY_LOOP"
+	"snd_fireFailed"	"Weapon_PipeWrench.Special"
+}
+
+entityDef projectile_pipewrench
+{
+	"spawnclass"		"ncProjectile"
+	"damage"			"skill:plr_pipewrench"
+	"is_bullet"			"1"
+	"range"				"32"
+	"decal_impact"		"Impact.Shot"
+	"detonate_on_world" "1"
+	"snd_hitBody"		"Weapon_PipeWrench.Melee_Hit"
+	"snd_hitWorld"		"Weapon_PipeWrench.Melee_HitWorld"
+	"gib"				"0"
+}
+
+entityDef projectile_pipewrenchCharge
+{
+	"spawnclass"		"ncProjectile"
+	"damage"			"skill:plr_pipewrench_charge"
+	"is_bullet"			"1"
+	"range"				"32"
+	"decal_impact"		"Impact.Shot"
+	"detonate_on_world" "1"
+	"snd_hitBody"		"Weapon_PipeWrench.Special_Hit"
+	"snd_hitWorld"		"Weapon_PipeWrench.Special_HitWorld"
+	"gib"				"1"
 }
diff --git a/decls/def/weapons/shockrifle.def b/decls/def/weapons/shockrifle.def
index 7cc33f2..a33c84f 100644
--- a/decls/def/weapons/shockrifle.def
+++ b/decls/def/weapons/shockrifle.def
@@ -1,3 +1,9 @@
+#define SHOCKRIFLE_IDLE1 0
+#define SHOCKRIFLE_FIRE 1
+#define SHOCKRIFLE_DRAW 2
+#define SHOCKRIFLE_HOLSTER 3
+#define SHOCKRIFLE_IDLE2 4
+
 entityDef weapon_shockrifle
 {
 	"editor_color"		".3 .3 1"
@@ -7,71 +13,106 @@ entityDef weapon_shockrifle
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
-	"model"			"models/w_shock.mdl"
+	"inherit"			"weapon_base"
+	"model"				"models/w_shock.mdl"
 	"model_view"		"models/v_shock.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
+	"model_flash"		"sprites/muzzle_shock.spr"
 
 	// NSWeapon specific
-	"def_fireInfo"		"fireInfo_shock"
-	"def_altFireInfo"	"fireInfo_fastshock"
-	"inv_name"		"Shock Roach"
+	"def_fireInfo"		"fireInfo_shockrifle"
+//	"def_altFireInfo"	"fireInfo_shockrifleAlt"	// Seems like something should have been here
+	"inv_name"			"Shock Roach"
 	"inv_ammo_shock"	"8"
+	"regenAmmo"			"1"
+	"regenRate"			"0.5"
+	"fireUnderwater"	"1"	// TODO needs to kill player(s)
 
-	"actFire"		"1"
-	"actHolster"		"3"
-	"actDraw"		"2"
-	"actIdle"		"0,4"
+	"act_fire"			"$SHOCKRIFLE_FIRE"
+	"act_holster"		"$SHOCKRIFLE_HOLSTER"
+	"act_draw"			"$SHOCKRIFLE_DRAW"
+	"act_idle"			"$SHOCKRIFLE_IDLE1,$SHOCKRIFLE_IDLE2"
+
+	"snd_fire"			"Weapon_ShockRifle.Single"
+	"snd_regen"			"Weapon_ShockRifle.Regen"
 
 	// HLWeapon specific
-	"hudSlot"		"4"
-	"hudSlotPos"		"0"
-	"weight"		"5"
+	"hudSlot"			"6"
+	"hudSlotPos"		"1"
+	"weight"			"5"
 }
 
-// TODO sprites/muzzle_shock.spr
-
-entityDef fireInfo_shock
+entityDef fireInfo_shockrifle
 {
-	"def_projectile"	"projectile_shock"
-	"ammoType"		"ammo_shock"
+	"def_onFire"		"projectile_shock"
+	"ammoType"			"ammo_shock"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
-	"fireRate"		"0.35"
+	"fireRate"			"0.2"
 	"punchAngle"		"-2 0 0"
 }
 
-entityDef fireInfo_fastshock
+entityDef fireInfo_shockrifleMP
 {
-	"def_projectile"	"projectile_shock"
-	"ammoType"		"ammo_shock"
+	"def_onFire"		"projectile_shock"
+	"ammoType"			"ammo_shock"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
-	"fireRate"		"0.1"
+	"fireRate"			"0.1"
 	"punchAngle"		"-2 0 0"
 }
 
+entityDef fireInfo_shockrifleAlt
+{
+	"def_onFire"		"projectile_shock"
+	"ammoType"			"ammo_shock"
+	"ammoRequired"		"1"
+	"ammoPerShot"		"1"
+	"fireRate"			"0.35"
+	"punchAngle"		"-2 0 0"
+}
 
 entityDef projectile_shock
 {
-	"spawnclass"		"NSProjectile"
-	"model"			"sprites/spike_trail.spr"
-	"frame"			"1"
-	"fuse"			"4"
-	"detonate_on_fuse"	"1"
-	"bounce"		"1"
-	"angular_velocity"	"-2000 0 0"
-	"model_detonate"	"fx_explosion.main"
-	"snd_explode"		"fx.explosion"
-	"snd_bounce"		"weapon_shockrifle.bounce"
-	"smoke_fly"		"weapon_rpg.trail"
-	"decal_detonate"	"ExplosionScorch"
+	"spawnclass"				"ncProjectile"
+	"model"						"sprites/spike_trail.spr"
+	"offset"					"16 30 -6"
+	"rendermode"				"$RM_ADDITIVE"
+	"renderamt"					"128"
+	"rendercolor"				"25 225 156"
+	"shadows"					"0"
 
-	"def_damage"		"damage_shockDirect"
+	"def_damage"				"damage_shockDirect"
+
+	"health"					"0"
+	"velocity"					"250"
+	"angular_velocity"			"0 0 0"
+	"fuse"						"10"
+	"detonate_on_fuse"			"0"
+	"detonate_on_death"			"1"
+	"detonate_on_world"			"1"
+	"detonate_on_actor"			"1"
+	"impact_damage_effect"		"1"
+	"impact_gib"				"1"
+
+	"thrust"					"10000"
+	"thrust_start"				"0"
+	"thrust_end"				"2"
+
+	"smoke_fly"					""
+	"decal_detonate"			"ShockScorch"
+	"model_detonate"			"fx_spark.main"
+	"light_color"				"0.05 0.8 0.5"
+	"light_radius"				"196"
+	"light_offset"				"0 0 0"
+
+	"explode_light_color"		"0.05 0.8 0.5"
+	"explode_light_radius"		"196"
+	"explode_light_fadetime"	"0.35"
+
+	"snd_explode"				"Weapon_ShockRifle.Impact"
 }
 
 entityDef damage_shockDirect
 {
-	"damage"	"1"
 	"damage"	"skill:plr_shockrifle"
-}
\ No newline at end of file
+}
diff --git a/decls/def/weapons/sniperrifle.def b/decls/def/weapons/sniperrifle.def
index fe9254d..16a1f2c 100644
--- a/decls/def/weapons/sniperrifle.def
+++ b/decls/def/weapons/sniperrifle.def
@@ -1,3 +1,13 @@
+#define SNIPERRIFLE_DRAW 0
+#define SNIPERRIFLE_IDLE 1
+#define SNIPERRIFLE_FIRE 2
+#define SNIPERRIFLE_FIRE_LAST 3
+#define SNIPERRIFLE_RELOAD_EMPTY 4
+#define SNIPERRIFLE_RELOAD_EMPTY_END 5
+#define SNIPERRIFLE_RELOAD 6
+#define SNIPERRIFLE_IDLE_EMPTY 7
+#define SNIPERRIFLE_HOLSTER 8
+
 entityDef weapon_sniperrifle
 {
 	"editor_color"		".3 .3 1"
@@ -7,55 +17,75 @@ entityDef weapon_sniperrifle
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
-	"model"			"models/w_m40a1.mdl"
+	"inherit"			"weapon_base"
+	"model"				"models/w_m40a1.mdl"
 	"model_view"		"models/v_m40a1.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 
 	// weapon specific
 	"def_fireInfo"		"fireInfo_sniperrifle"
-	"inv_name"		"M40A1 Sniper Rifle"
-	"clipSize"		"5"
+	"inv_name"			"M40A1 Sniper Rifle"
+	"clipSize"			"5"
 
-	"actFire"		"2"
-	"actFireLast"		"3"
-	"actHolster"		"8"
-	"actReload"		"6"
-	"actReloadEmpty"	"4+5"
-	"actDraw"		"0"
-	"actIdle"		"1,7"
 
-	"snd_fire"		"weapon_sniperrifle.shoot"
-	"snd_empty"		"weapon_sniperrifle.empty"
-	"snd_reload"		"weapon_sniperrifle.reload"
+	"act_fire"			"$SNIPERRIFLE_FIRE"
+	"act_fireLast"		"$SNIPERRIFLE_FIRE_LAST"
+	"act_holster"		"$SNIPERRIFLE_HOLSTER"
+//	"act_holsterEmpty"	"$SNIPERRIFLE_HOLSTER_EMPTY"
+	"act_reload"		"$SNIPERRIFLE_RELOAD"
+	"act_reloadEmpty"	"$SNIPERRIFLE_RELOAD_EMPTY"
+	"act_reloadEndEmpty""$SNIPERRIFLE_RELOAD_EMPTY_END"
+	"act_draw"			"$SNIPERRIFLE_DRAW"
+//	"act_drawEmpty"		"$SNIPERRIFLE_DRAW_EMPTY"
+	"act_idle"			"$SNIPERRIFLE_IDLE"
+	"act_idleEmpty"		"$SNIPERRIFLE_IDLE_EMPTY"
+
+	"snd_fire"		"Weapon_SniperRifle.shoot"
+	"snd_empty"		"Weapons.Empty"
+	"snd_reload"	"Weapon_SniperRifle.reload"
+
+	"altMode"		"1"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
-	"hudSlotPos"		"1"
+	"hudSlot"		"5"
+	"hudSlotPos"	"2"
 	"weight"		"15"
+	"zoomFov"		"18"
 }
 
 entityDef projectile_sniperrifle
 {
 	"inherit"		"projectile_bullet_base"
-	"damage"	"skill:plr_sniperrifle_bullet"
+	"damage"		"skill:plr_sniperrifle_bullet"
+}
+
+entityDef projectile_sniperrifleZoom
+{
+	"inherit"		"projectile_bullet_base"
+	"damage"		"skill:plr_sniperrifle_zoom_bullet"
 }
 
 entityDef fireInfo_sniperrifle
 {
 	"def_projectile"	"projectile_sniperrifle"
-	"ammoType"		"ammo_762"
+	"ammoType"			"ammo_762"
 	"inv_ammo_762"		"5"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
-	"fireRate"		"1.75"
+	"fireRate"			"1.75"
 	"punchAngle"		"-10 0 0"
 	"model_flash"		"sprites/muzzleflash2.spr" // TODO check this
+	"spread"			"0.1 0.1"
 }
 
-entityDef fireInfo_zoom
+entityDef fireInfo_sniperrifleZoom
 {
-	// TODO need zoom working
-	"fov"			"0.25"
-	"accuracy"		"1.0" // perfect with zoom
-}
\ No newline at end of file
+	"def_projectile"	"projectile_sniperrifleZoom"
+	"ammoType"			"ammo_762"
+	"inv_ammo_762"		"5"
+	"ammoRequired"		"1"
+	"ammoPerShot"		"1"
+	"fireRate"			"1.75"
+	"punchAngle"		"-10 0 0"
+	"model_flash"		"sprites/muzzleflash2.spr" // TODO check this
+	"spread"			"0 0"
+}
diff --git a/decls/def/weapons/sporelauncher.def b/decls/def/weapons/sporelauncher.def
index 4e35af1..70f615c 100644
--- a/decls/def/weapons/sporelauncher.def
+++ b/decls/def/weapons/sporelauncher.def
@@ -1,3 +1,13 @@
+#define SPORELAUNCHER_IDLE1 0
+#define SPORELAUNCHER_RELOAD_START 2
+#define SPORELAUNCHER_RELOAD 3
+#define SPORELAUNCHER_RELOAD_END 4
+#define SPORELAUNCHER_HOLSTER 6
+#define SPORELAUNCHER_DRAW 7
+#define SPORELAUNCHER_FIRE 5
+#define SPORELAUNCHER_IDLE2 8
+#define SPORELAUNCHER_IDLE3 9
+
 entityDef weapon_sporelauncher
 {
 	"editor_color"		".3 .3 1"
@@ -7,80 +17,80 @@ entityDef weapon_sporelauncher
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
-	"model"			"models/w_spore_launcher.mdl"
+	"inherit"			"weapon_base"
+	"model"				"models/w_spore_launcher.mdl"
 	"model_view"		"models/v_spore_launcher.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 
 	// NSWeapon specific
 	"def_fireInfo"		"fireInfo_spore"
 	"def_altFireInfo"	"fireInfo_fastspore"
-	"inv_name"		"Spore Launcher"
+	"inv_name"			"Spore Launcher"
 	"inv_ammo_spore"	"5"
+	"clipSize"			"5"
 
-	"actFire"		"5"
-	"actHolster"		"6"
-	"actReloadStart"	"2"
-	"actReload"		"3"
-	"actReloadEnd"		"4"
-	"actDraw"		"7"
-	"actIdle"		"0,1,8"
+	"act_fire"			"$SPORELAUNCHER_FIRE"
+	"act_holster"		"$SPORELAUNCHER_HOLSTER"
+	"act_reloadStart"	"$SPORELAUNCHER_RELOAD_START"
+	"act_reload"		"$SPORELAUNCHER_RELOAD"
+	"act_reloadEnd"		"$SPORELAUNCHER_RELOAD_END"
+	"act_draw"			"$SPORELAUNCHER_DRAW"
+	"act_idle"			"$SPORELAUNCHER_IDLE1,$SPORELAUNCHER_IDLE2,$SPORELAUNCHER_IDLE3"
 
 	// HLWeapon specific
-	"hudSlot"		"4"
+	"hudSlot"			"6"
 	"hudSlotPos"		"0"
-	"weight"		"5"
+	"weight"			"5"
 }
 
 entityDef fireInfo_spore
 {
-	"def_projectile"	"projectile_spore"
-	"ammoType"		"ammo_spore"
+	"def_onFire"		"projectile_spore"
+	"ammoType"			"ammo_spore"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
-	"fireRate"		"0.75"
+	"fireRate"			"0.75"
 	"punchAngle"		"-2 0 0"
 }
 
 entityDef fireInfo_fastspore
 {
-	"def_projectile"	"projectile_fastspore"
-	"ammoType"		"ammo_spore"
+	"def_onFire"		"projectile_sporeFast"
+	"ammoType"			"ammo_spore"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
-	"fireRate"		"1.0"
+	"fireRate"			"1.0"
 	"punchAngle"		"-2 0 0"
 }
 
-
 entityDef projectile_spore
 {
-	"spawnclass"		"NSProjectile"
-	"model"			"models/spore.mdl"
-	"frame"			"1"
-	"fuse"			"4"
+	"spawnclass"		"ncProjectile"
+	"model"				"models/spore.mdl"
+	"frame"				"1"
+	"fuse"				"4"
 	"detonate_on_fuse"	"1"
-	"bounce"		"1"
-	"angular_velocity"	"-2000 0 0"
+	"bounce"			"1"
+	"velocity"			"1200"
 	"model_detonate"	"fx_explosion.main"
 	"snd_explode"		"fx.explosion"
-	"snd_bounce"		"weapon_sporelauncher.bounce"
-	"smoke_fly"		"weapon_rpg.trail"
+	"snd_bounce"		"Weapon_SporeLauncher.bounce"
+	"smoke_fly"			"weapon_sporelauncher.trail"
 	"decal_detonate"	"ExplosionScorch"
 
 	"def_damage"		"damage_sporeDirect"
 	"def_splash_damage"	"damage_sporeSplash"
 }
 
-entityDef projectile_fastspore
+entityDef projectile_sporeFast
 {
-	inherit "projectile_spore"
-	"angular_velocity"	"-4000 0 0"
+	"spawnclass"		"ncProjectile"
+	"inherit" 			"projectile_spore"
+	"velocity"			"3000"
+	"detonate_on_world"	"1"
 }
 
 entityDef damage_sporeDirect
 {
-	"damage"	"1"
 	"damage"	"skill:plr_spore_launcher"
 }
 
diff --git a/decls/def/weapons_gearbox.def b/decls/def/weapons_gearbox.def
index 25778ea..7d0f6d9 100644
--- a/decls/def/weapons_gearbox.def
+++ b/decls/def/weapons_gearbox.def
@@ -1,26 +1,10 @@
-#include "weapons/357.def"
-#include "weapons/9mmAR.def"
-#include "weapons/9mmhandgun.def"
-#include "weapons/crossbow.def"
-#include "weapons/crowbar.def"
 #include "weapons/displacer.def"
 #include "weapons/eagle.def"
-#include "weapons/egon.def"
-#include "weapons/gauss.def"
 #include "weapons/grapple.def"
-#include "weapons/handgrenade.def"
-#include "weapons/hornetgun.def"
 #include "weapons/knife.def"
 #include "weapons/m249.def"
 #include "weapons/penguin.def"
 #include "weapons/pipewrench.def"
-#include "weapons/rpg.def"
-#include "weapons/satchel.def"
 #include "weapons/shockrifle.def"
-#include "weapons/shotgun.def"
-#include "weapons/snark.def"
 #include "weapons/sniperrifle.def"
 #include "weapons/sporelauncher.def"
-#include "weapons/tripmine.def"
-
-
diff --git a/decls/sound/weapons_gearbox.sndshd b/decls/sound/weapons_gearbox.sndshd
index be88101..b6ff235 100644
--- a/decls/sound/weapons_gearbox.sndshd
+++ b/decls/sound/weapons_gearbox.sndshd
@@ -1,10 +1,20 @@
-weapon_eagle.shoot
+Weapon_Eagle.Single
 {
 	alerts
 	sample "weapons/de_shot1.wav"
 }
 
-weapon_m249.fire
+Weapon_Eagle.LaserOn
+{
+	sample "weapons/desert_eagle_sight.wav"
+}
+
+Weapon_Eagle.LaserOff
+{
+	sample "weapons/desert_eagle_sight2.wav"
+}
+
+Weapon_M249.Single
 {
 	alerts
 	sample "weapons/saw_fire1.wav"
@@ -12,27 +22,46 @@ weapon_m249.fire
 	sample "weapons/saw_fire3.wav"
 }
 
-weapon_pipewrench.big_hit
+Weapon_PipeWrench.big_hit
 {
 	alerts
 	pitch 1.2
 	sample "weapons/pwrench_big_hit1.wav"
 }
 
-weapon_pipewrench.hit
+Weapon_PipeWrench.hit
 {
 	alerts
 	sample "weapons/pwrench_hit1.wav"
 	sample "weapons/pwrench_hit2.wav"
 }
 
-weapon_sporelauncher.bounce
+Weapon_ShockRifle.Impact
+{
+	alerts
+	sample "weapons/shock_impact.wav"
+}
+
+Weapon_ShockRifle.Single
+{
+	alerts
+	sample "weapons/shock_fire.wav"
+}
+
+Weapon_ShockRifle.Regen
+{
+	alerts
+	sample "weapons/shock_recharge.wav"
+}
+
+Weapon_SporeLauncher.bounce
 {
 	sample "weapons/splauncher_bounce.wav"
 }
 
-weapon_sporelauncher.explode
+Weapon_SporeLauncher.Impact
 {
 	alerts
 	sample "weapons/splauncher_impact.wav"
-}
\ No newline at end of file
+}
+