diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index 4b47e1f02..588f60031 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -136,9 +136,15 @@ DoomEdNums
   9872 = SpotLightFlickerAttenuated
   9873 = SectorSpotLightAttenuated
   9874 = SpotLightFlickerRandomAttenuated
-  9876 = PointLightTraceAttenuated // ZDRay static point light
-  9881 = SpotLightTraceAttenuated // ZDRay static spotlight
-  9890 = None	// ZDRayInfo
+  9876 = PointLightTraceAttenuated					// ZDRay static point light
+  9877 = PointLightPulseTraceAttenuated				// ZDRay static point light (pulsing)
+  9878 = PointLightFlickerTraceAttenuated			// ZDRay static point light (flickering)
+  9879 = PointLightFlickerRandomTraceAttenuated		// ZDRay static point light (random flickering)
+  9881 = SpotLightTraceAttenuated					// ZDRay static spotlight
+  9882 = SpotLightPulseTraceAttenuated				// ZDRay static spotlight (pulsing)
+  9883 = SpotLightFlickerTraceAttenuated			// ZDRay static spotlight (flickering)
+  9884 = SpotLightFlickerRandomTraceAttenuated		// ZDRay static spotlight (random flickering)
+  9890 = None										// ZDRayInfo
   9982 = SecActEyesAboveC
   9983 = SecActEyesBelowC
   9988 = CustomSprite
diff --git a/wadsrc/static/zscript/actors/shared/dynlights.zs b/wadsrc/static/zscript/actors/shared/dynlights.zs
index 132c78fd0..664b6d1d9 100644
--- a/wadsrc/static/zscript/actors/shared/dynlights.zs
+++ b/wadsrc/static/zscript/actors/shared/dynlights.zs
@@ -442,25 +442,6 @@ class SpotLightFlickerRandomAttenuated : SpotLightFlickerRandom
 	}
 }
 
-class PointLightTraceAttenuated : PointLightAttenuated
-{
-	Default
-	{
-		+DYNAMICLIGHT.TRACE
-		+DYNAMICLIGHT.DONTLIGHTMAP
-	}
-}
-
-class SpotLightTraceAttenuated : SpotLightAttenuated
-{
-	Default
-	{
-		+DYNAMICLIGHT.TRACE
-		+DYNAMICLIGHT.DONTLIGHTMAP
-	}
-}
-
-
 class VavoomLight : DynamicLight 
 {
 	Default
@@ -501,4 +482,58 @@ class VavoomLightColor : VavoomLight
 	}
 }
 
+//==========================================================================
+//
+// ZDRay Lights
+//
+//==========================================================================
 
+// to reduce copy/pasting
+mixin class TraceLightDefaults
+{
+	Default
+	{
+		+DYNAMICLIGHT.TRACE
+		+DYNAMICLIGHT.DONTLIGHTMAP
+	}
+}
+
+class PointLightTraceAttenuated : PointLightAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class PointLightPulseTraceAttenuated : PointLightPulseAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class PointLightFlickerTraceAttenuated : PointLightFlickerAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class PointLightFlickerRandomTraceAttenuated : PointLightFlickerRandomAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class SpotLightTraceAttenuated : SpotLightAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class SpotLightPulseTraceAttenuated : SpotLightPulseAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class SpotLightFlickerTraceAttenuated : SpotLightFlickerAttenuated
+{
+	mixin TraceLightDefaults;
+}
+
+class SpotLightFlickerRandomTraceAttenuated : SpotLightFlickerRandomAttenuated
+{
+	mixin TraceLightDefaults;
+}