diff --git a/src/namedef.h b/src/namedef.h
index 054c53e49..f94d00858 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -502,6 +502,8 @@ xx(Roll)
 xx(Scale)
 xx(ScaleX)
 xx(ScaleY)
+xx(SpotInnerAngle)
+xx(SpotOuterAngle)
 xx(Floatbobphase)
 xx(Floatbobstrength)
 xx(Target)
diff --git a/src/p_udmf.cpp b/src/p_udmf.cpp
index 24257dbcd..4df2d08eb 100644
--- a/src/p_udmf.cpp
+++ b/src/p_udmf.cpp
@@ -799,6 +799,14 @@ public:
 				th->Scale.X = th->Scale.Y = CheckFloat(key);
 				break;
 
+			case NAME_SpotInnerAngle:
+				th->SpotInnerAngle = CheckFloat(key);
+				break;
+
+			case NAME_SpotOuterAngle:
+				th->SpotOuterAngle = CheckFloat(key);
+				break;
+
 			default:
 				CHECK_N(Zd | Zdt)
 				if (0 == strnicmp("user_", key.GetChars(), 5))
diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index d183675c0..500e9b3c7 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -114,6 +114,27 @@ DoomEdNums
   9842 = SpotLightFlicker
   9843 = SectorSpotLight
   9844 = SpotLightFlickerRandom
+<<<<<<< Updated upstream
+=======
+<<<<<<< HEAD
+  9850 = SpotLightAdditive
+  9851 = SpotLightPulseAdditive
+  9852 = SpotLightFlickerAdditive
+  9853 = SectorSpotLightAdditive
+  9854 = SpotLightFlickerRandomSubtractive
+  9860 = SpotLightSubtractive
+  9861 = SpotLightPulseSubtractive
+  9862 = SpotLightFlickerSubtractive
+  9863 = SectorSpotLightSubtractive
+  9864 = SpotLightFlickerRandomSubtractive
+  9870 = SpotLightAttenuated
+  9871 = SpotLightPulseAttenuated
+  9872 = SpotLightFlickerAttenuated
+  9873 = SectorSpotLightAttenuated
+  9874 = SpotLightFlickerRandomAttenuated
+=======
+>>>>>>> 7f7c720883e6841ced9c5e66cdae5e6b531872ad
+>>>>>>> Stashed changes
   9982 = SecActEyesAboveC
   9983 = SecActEyesBelowC
   9988 = CustomSprite
diff --git a/wadsrc/static/zscript/shared/dynlights.txt b/wadsrc/static/zscript/shared/dynlights.txt
index 362389b8a..59584bb23 100644
--- a/wadsrc/static/zscript/shared/dynlights.txt
+++ b/wadsrc/static/zscript/shared/dynlights.txt
@@ -245,6 +245,132 @@ class SpotLightFlickerRandom : SpotLight
 		DynamicLight.Type "RandomFlicker";
 	}
 }
+<<<<<<< Updated upstream
+=======
+<<<<<<< HEAD
+
+class SpotLightAdditive : SpotLight
+{
+	Default
+	{
+		+DYNAMICLIGHT.ADDITIVE
+	}
+}
+
+class SpotLightPulseAdditive : SpotLightPulse
+{
+	Default
+	{
+		+DYNAMICLIGHT.ADDITIVE
+	}
+}
+
+class SpotLightFlickerAdditive : SpotLightFlicker
+{
+	Default
+	{
+		+DYNAMICLIGHT.ADDITIVE
+	}
+}
+
+class SectorSpotLightAdditive : SectorSpotLight
+{
+	Default
+	{
+		+DYNAMICLIGHT.ADDITIVE
+	}
+}
+
+class SpotLightFlickerRandomAdditive : SpotLightFlickerRandom
+{
+	Default
+	{
+		+DYNAMICLIGHT.ADDITIVE
+	}
+}
+
+class SpotLightSubtractive : SpotLight
+{
+	Default
+	{
+		+DYNAMICLIGHT.SUBTRACTIVE
+	}
+}
+
+class SpotLightPulseSubtractive : SpotLightPulse
+{
+	Default
+	{
+		+DYNAMICLIGHT.SUBTRACTIVE
+	}
+}
+
+class SpotLightFlickerSubtractive : SpotLightFlicker
+{
+	Default
+	{
+		+DYNAMICLIGHT.SUBTRACTIVE
+	}
+}
+
+class SectorSpotLightSubtractive : SectorSpotLight
+{
+	Default
+	{
+		+DYNAMICLIGHT.SUBTRACTIVE
+	}
+}
+
+class SpotLightFlickerRandomSubtractive : SpotLightFlickerRandom
+{
+	Default
+	{
+		+DYNAMICLIGHT.SUBTRACTIVE
+	}
+}
+
+class SpotLightAttenuated : SpotLight
+{
+	Default
+	{
+		+DYNAMICLIGHT.ATTENUATE
+	}
+}
+
+class SpotLightPulseAttenuated : SpotLightPulse
+{
+	Default
+	{
+		+DYNAMICLIGHT.ATTENUATE
+	}
+}
+
+class SpotLightFlickerAttenuated : SpotLightFlicker
+{
+	Default
+	{
+		+DYNAMICLIGHT.ATTENUATE
+	}
+}
+
+class SectorSpotLightAttenuated : SectorSpotLight
+{
+	Default
+	{
+		+DYNAMICLIGHT.ATTENUATE
+	}
+}
+
+class SpotLightFlickerRandomAttenuated : SpotLightFlickerRandom
+{
+	Default
+	{
+		+DYNAMICLIGHT.ATTENUATE
+	}
+}
+=======
+>>>>>>> 7f7c720883e6841ced9c5e66cdae5e6b531872ad
+>>>>>>> Stashed changes
 
 class VavoomLight : DynamicLight 
 {