diff --git a/decls/def/weapons/displacer.def b/decls/def/weapons/displacer.def
index f3b838a..a9874cd 100644
--- a/decls/def/weapons/displacer.def
+++ b/decls/def/weapons/displacer.def
@@ -1,3 +1,11 @@
+#define DISPLACER_IDLE1 0
+#define DISPLACER_IDLE2 1
+#define DISPLACER_FIRE_CHARGE 2
+#define DISPLACER_FIRE 3
+#define DISPLACER_FIRE_RELEASE 4
+#define DISPLACER_DRAW 5
+#define DISPLACER_HOLSTER 6
+
 entityDef weapon_displacer
 {
 	"editor_color"		".3 .3 1"
@@ -7,42 +15,55 @@ entityDef weapon_displacer
 	"editor_rotatable"	"1"
 
 	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_base"
 	"model"				"models/w_displacer.mdl"
 	"model_view"		"models/v_displacer.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 
 	// weapon specific
 	"def_fireInfo"		"fireInfo_displacer"
+	"def_altFireInfo"	"fireInfo_displacerSelf"
 	"inv_name"			"Displacer"
 	"inv_ammo_uranium"	"40"
 
-	"actFire"			"4"
-	//"actFireSpin"		"2,3"
-	"actHolster"		"6"
-	"actDraw"			"5"
-	"actIdle"			"0,1"
+	"act_fireStart"		"$DISPLACER_FIRE_CHARGE"
+	"act_fire"			"$DISPLACER_FIRE"
+	"act_fireStop"		"$DISPLACER_FIRE_RELEASE"
+	"act_holster"		"$DISPLACER_HOLSTER"
+	"act_draw"			"$DISPLACER_DRAW"
+	"act_idle"			"$DISPLACER_IDLE1,$DISPLACER_IDLE2"
 
-	"snd_fire"			"weapon_displacer.fire"
-	"snd_empty"			"weapon_displacer.empty"
-	"snd_reload"		"weapon_displacer.reload"
+//	TODO there is no charge
+//	needs to release instead
+	"chargeTime"		"0"
+
+	"snd_fire"			"Weapon_Displacer.Single"
+	"snd_empty"			"Weapons.Empty"
 
 	// HLWeapon specific
-	"hudSlot"			"3"
-	"hudSlotPos"		"0"
+	"hudSlot"			"5"
+	"hudSlotPos"		"1"
 	"weight"			"20"
 }
 
 entityDef projectile_portal
 {
-	"spawnclass"				"NSProjectile"
+	"spawnclass"				"ncProjectile"
 	"model"						"sprites/exit1.spr"
+	"rendermode"				"$RM_ADDITIVE"
+	"renderamt"					"192"
+	"shadows"					"0"
 
 	"def_damage"				"damage_portalDirect"
 	"def_splash_damage"			"damage_portalSplash"
 
+	"OnSpawn"					"!self,SpawnDefAttachment,displacer_beam,0,-1"
+	"OnSpawn"					"!self,SpawnDefAttachment,displacer_beam,0,-1"
+	"OnSpawn"					"!self,SpawnDefAttachment,displacer_beam,0,-1"
+	"OnTouch"					"!self,SpawnDefAttachment,displacer_shockwave,0,-1"
+	"OnKilled"					"!self,KillChildClass,displacer_beam,0,-1"
+
 	"health"					"0"
-	"velocity"					"250"
+	"velocity"					"350"
 	"angular_velocity"			"0 0 200"
 	"fuse"						"10"
 	"detonate_on_fuse"			"0"
@@ -52,10 +73,6 @@ entityDef projectile_portal
 	"impact_damage_effect"		"1"
 	"impact_gib"				"1"
 
-	"thrust"					"1000"
-	"thrust_start"				"0.1"
-	"thrust_end"				"2"
-
 	"model_detonate"			"fx_explosion.main"
 	"light_color"				"0.15 1 0"
 	"light_radius"				"160"
@@ -68,9 +85,61 @@ entityDef projectile_portal
 	"snd_explode"				"fx_portal.touch"
 }
 
+entityDef projectile_portalSelf
+{
+	"spawnclass"		"ncProjectile"
+	"inherit"			"projectile_portal"
+}
+
+
+entityDef projectile_portalSelf
+{
+	"spawnclass"		"ncProjectile"
+	"inherit"			"projectile_portal"
+}
+
+entityDef displacer_shockwave
+{
+	"spawnclass"		"env_shockwave"
+	"netname"			"sprites/disp_ring.spr"
+	"renderamt"			"128"
+	"m_iTime"			"2"
+	"m_iRadius"			"1000"
+	"m_iHeight"			"32"
+	"m_iScrollRate"		"0"
+	"m_iNoise"			"0"
+	"m_iFrameRate"		"0"
+	"m_iStartFrame"		"0"
+}
+
+entityDef displacer_beam
+{
+	"spawnclass"		"env_beam"
+	"texture"			"sprites/lgtning.spr"
+	"rendercolor"		"96 128 16"
+	"renderamt"			"64"
+	"NoiseAmplitude"	"80"
+	"life"				"3"
+	"Radius"			"512"
+	"BoltWidth"			"16"
+	"RadiusScale"		"0 1 1"
+	"spawnflags"		"1"
+	"decal_detonate"	"Impact.Shot"
+}
+
 entityDef fireInfo_displacer
 {
-	"def_projectile"	"projectile_portal"
+	"def_onFire"		"projectile_portal"
+	"ammoType"			"ammo_uranium"
+	"ammoRequired"		"20"
+	"ammoPerShot"		"20"
+	"fireRate"			"3.0"
+	"punchAngle"		"-2 0 0"
+}
+
+entityDef fireInfo_displacerSelf
+{
+	"def_onFire"		"projectile_portalSelf"
 	"ammoType"			"ammo_uranium"
 	"ammoRequired"		"20"
 	"ammoPerShot"		"20"