diff --git a/zpak001.pk3dir/decls/def/weapons/chainsaw.def b/zpak001.pk3dir/decls/def/weapons/chainsaw.def
index 2474ca9..44c7dad 100644
--- a/zpak001.pk3dir/decls/def/weapons/chainsaw.def
+++ b/zpak001.pk3dir/decls/def/weapons/chainsaw.def
@@ -27,12 +27,12 @@ entityDef weapon_chainsaw
 	"meleeRateMiss"		"0.5"
 	"meleeRateHit"		"0.25"
 
-	"actIdle"			"5,6"
-	"actDraw"			"3"
-	"actHolster"		"4"
+	"act_idle"			"5,6"
+	"act_draw"			"3"
+	"act_holster"		"4"
 	"actMeleeStart"		"0"
-	"actMeleeMiss"		"1"
-	"actMeleeHit"		"1"
+	"act_fireFailed"		"1"
+	"act_fire"		"1"
 	"actMeleeStop"		"2"
 
 	// HLWeapon specific
diff --git a/zpak001.pk3dir/decls/def/weapons/hammer.def b/zpak001.pk3dir/decls/def/weapons/hammer.def
index 964f8ce..58fa999 100644
--- a/zpak001.pk3dir/decls/def/weapons/hammer.def
+++ b/zpak001.pk3dir/decls/def/weapons/hammer.def
@@ -12,19 +12,20 @@ entityDef weapon_hammer
 	"snd_acquire"		"weapon.pickup"
 	"snd_respawn"		"item.respawn"
 	"snd_hit"			"weapon_hammer.hit"
-	"snd_miss"			"weapon_hammer.miss"
+	"snd_failed"		"weapon_hammer.miss"
 
 	// weapon specific
-	"def_melee"			"damage_hammer"
-	"def_meleeAlt"		"damage_hammerWindup"
-	"melee_distance"	"32"
+	"def_fireInfo"		"fireInfo_hammer"
+	"def_altFireInfo"	"fireInfo_hammerCharged"
 	"inv_name"			"Hammer"
-	"ammoType"			""
 	"ammoRequired"		"0"
+	"silent_fire"		"1"
 
-	"actIdle"			"0,5,6"
-	"actDraw"			"1"
-	"actHolster"		"2,7,8"
+	"testDistance"		"-32"
+
+	"act_idle"			"0,5,6"
+	"act_draw"			"1"
+	"act_holster"		"2,7,8"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -34,31 +35,42 @@ entityDef weapon_hammer
 	"ammoIcon"		"none"
 }
 
-
-// TODO double check push/knockback works on victims
-entityDef damage_hammer
+entityDef damage_hammerCharged
 {
-	"damage"			"skill:plr_hammer"
-//	"kickDir"			"-1 0 0"
-//	"knockback"			"20"
-	"push"				"20000"
-	"gib"				"0"
-
-	"meleeRateMiss"		"1.0"
-	"meleeRateHit"		"1.0"
-	"actMeleeMiss"		"3"
-	"actMeleeHit"		"3"
-
+	"damage"				"skill: plr_hammer_alt"
 }
 
-// TODO
-entityDef damage_hammerWindup
+entityDef projectile_hammer
 {
-	"damage"			"skill:plr_hammer_alt"
-	"gib"				"1"
-
-	"meleeRateMiss"		"0.75"
-	"meleeRateHit"		"0.75"
-	"actMeleeMiss"		"4"
-	"actMeleeHit"		"4"
+	"spawnclass"			"NSProjectile"
+	"damage"				"skill:plr_hammer"
+	"is_bullet"				"1"
+	"decal_impact"			"Impact.Shot"
+	"detonate_on_world" 	"1"
+	"push"					"3500"
+}
+
+entityDef projectile_hammerCharged
+{
+	"spawnclass"			"NSProjectile"
+	"def_damage"			"damage_hammerCharged"
+	"is_bullet"				"1"
+	"decal_impact"			"Impact.Shot"
+	"detonate_on_world" 	"1"
+}
+
+entityDef fireInfo_hammer
+{
+	"def_onFire"		"projectile_hammer"
+	"failRate"			"1.0"
+	"fireRate"			"1.0"
+	"act_fireFailed"	"3"
+	"act_fire"			"3"
+}
+
+entityDef fireInfo_hammerCharged
+{
+	"def_onRelease"		"projectile_hammerCharged"
+	"act_fireFailed"	"4"
+	"act_fire"			"4"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/handcannon.def b/zpak001.pk3dir/decls/def/weapons/handcannon.def
index c7c8fd8..43c2852 100644
--- a/zpak001.pk3dir/decls/def/weapons/handcannon.def
+++ b/zpak001.pk3dir/decls/def/weapons/handcannon.def
@@ -21,10 +21,10 @@ entityDef weapon_handcannon
 	"ammoRequired"		"1"
 	"model_flash"		"sprites/muzzleflash2.spr"
 
-	"actHolster"		"5"
-	"actReload"			"3"
-	"actDraw"			"4"
-	"actIdle"			"6,7"
+	"act_holster"		"5"
+	"act_reload"			"3"
+	"act_draw"			"4"
+	"act_idle"			"6,7"
 
 	"snd_fire"			"weapon_handcannon.shoot"
 	"snd_empty"			"weapon_shotgun.empty"
@@ -56,7 +56,7 @@ entityDef fireInfo_handcannon
 	"def_onFire"	"projectile_handcannon"
 	"ammoPerShot"		"2"
 	"fireRate"			"1.5"
-	"actFire"			"0"
+	"act_fire"			"0"
 }
 
 entityDef fireInfo_altCannon
@@ -64,7 +64,7 @@ entityDef fireInfo_altCannon
 	"def_onFire"	"projectile_handcannon_single"
 	"ammoPerShot"		"1"
 	"fireRate"			"1.5"
-	"actFire"			"1,2"
+	"act_fire"			"1,2"
 }
 
 // TODO respect sh_hchorror = 1
@@ -72,6 +72,6 @@ entityDef fireInfo_handcannonHorror
 {
 	"def_onFire"	"projectile_handcannon"
 	"fireRate"			"0.5"
-	"actFire"			"0"
+	"act_fire"			"0"
 	"ammoRequired"		"0"
 }
\ No newline at end of file