diff --git a/PYWHEEL.txt b/PYWHEEL.txt
index a02ea0a9a..a6007aa3c 100644
--- a/PYWHEEL.txt
+++ b/PYWHEEL.txt
@@ -1,22 +1,27 @@
 Demolitionist
 {
-	include "PusherWeapon"
-	//include "ItamexHammer"
-	include "DeepImpact"
-	include "ExplodiumGun"
-	include "Spreadgun"
-	//include "PuntzerBeta"
-	include "Wallbuster"
-	//include "PuntzerGamma"
-	include "Eviscerator"
-	//include "Quadravol"
-	include "Hellblazer"
-	//include "BlackfireIgniter"
-	include "Sparkster"
-	//include "ModernSparkster"
-	include "SilverBullet"
-	//include "EMPCarbine"
-	include "CandyGun"
-	//include "PROWELfartsupintheTADEL"
-	include "Ynykron"
+	include "PusherWeapon";
+	//include "ItamexHammer";
+	include "DeepImpact";
+	include "ExplodiumGun";
+	include "Spreadgun";
+	//include "PuntzerBeta";
+	include "Wallbuster";
+	//include "PuntzerGamma";
+	include "Eviscerator";
+	//include "Quadravol";
+	//include "HeavyMahSheenGun";
+	include "Hellblazer";
+	//include "BlackfireIgniter";
+	//include "SkullLauncher";
+	include "Sparkster";
+	//include "ModernSparkster";
+	include "SilverBullet";
+	//include "EMPCarbine";
+	//include "Cryolance";
+	include "CandyGun";
+	//include "PROWELfartsupintheTADEL";
+	//include "RayKhom";
+	include "Ynykron";
+	//include "AODWeapon";
 }
diff --git a/language.version b/language.version
index 0bf212826..cc0d9695c 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \cwGZ\c- r511 (Fri 28 Aug 19:28:07 CEST 2020)";
+SWWM_MODVER="\chSWWM \cwGZ\c- r512 (Sun 30 Aug 11:35:31 CEST 2020)";
diff --git a/zscript/swwm_deathlydeathcannon.zsc b/zscript/swwm_deathlydeathcannon.zsc
index b4b356ba6..497ab198c 100644
--- a/zscript/swwm_deathlydeathcannon.zsc
+++ b/zscript/swwm_deathlydeathcannon.zsc
@@ -331,10 +331,15 @@ Class YnykronImpact : Actor
 			if ( tracer && (tracer.Health <= 0) )
 			{
 				if ( tracer.player ) PlayerGone.FeckOff(tracer);
-				// poof away
-				tracer.bINVISIBLE = true;
-				tracer.A_ChangeLinkFlags(false);	// remove from blockmap, should guarantee archviles not raising this
-				IDontFeelSoGood.DeletThis(tracer);	// ensures corpse is deleted too
+				if ( tracer.FindState("YnykronDeath",true) )
+					tracer.SetStateLabel("YnykronDeath");	// dedicated state
+				else
+				{
+					// poof away manually
+					tracer.bINVISIBLE = true;
+					tracer.A_ChangeLinkFlags(false);	// remove from blockmap, should guarantee archviles not raising this
+					IDontFeelSoGood.DeletThis(tracer);	// ensures corpse is deleted too
+				}
 			}
 		}
 		if ( YnykronShot(master) )