Merge branch 'master' into unofficial-port

Build/Configurations/SRB2-22.cfg

@@ -640,6 +640,39 @@ linedeftypes
 			prefix = "(63)";
 		}
 
+		96
+		{
+			title = "Apply Tag to Tagged Sectors";
+			prefix = "(96)";
+			flags1024text = "[10] Offsets are target tags";
+			flags8192text = "[13] Use front side offsets";
+			flags32768text = "[15] Use back side offsets";
+		}
+
+		97
+		{
+			title = "Apply Tag to Front Sector";
+			prefix = "(97)";
+			flags8192text = "[13] Use front side offsets";
+			flags32768text = "[15] Use back side offsets";
+		}
+
+		98
+		{
+			title = "Apply Tag to Back Sector";
+			prefix = "(98)";
+			flags8192text = "[13] Use front side offsets";
+			flags32768text = "[15] Use back side offsets";
+		}
+
+		99
+		{
+			title = "Apply Tag to Front and Back Sectors";
+			prefix = "(99)";
+			flags8192text = "[13] Use front side offsets";
+			flags32768text = "[15] Use back side offsets";
+		}
+
 		540
 		{
 			title = "Floor Friction";
@@ -880,44 +913,6 @@ linedeftypes
 			flags64text = "[6] Inverse movement";
 		}
 	}
-	
-	multitagging
-	{
-		title = "Multi-tagging";
-		
-		96
-		{
-			title = "Apply Tag to Tagged Sectors";
-			prefix = "(96)";
-			flags1024text = "[10] Offsets are target tags";
-			flags8192text = "[13] Use front side offsets";
-			flags32768text = "[15] Use back side offsets";
-		}
-
-		97
-		{
-			title = "Apply Tag to Front Sector";
-			prefix = "(97)";
-			flags8192text = "[13] Use front side offsets";
-			flags32768text = "[15] Use back side offsets";
-		}
-
-		98
-		{
-			title = "Apply Tag to Back Sector";
-			prefix = "(98)";
-			flags8192text = "[13] Use front side offsets";
-			flags32768text = "[15] Use back side offsets";
-		}
-
-		99
-		{
-			title = "Apply Tag to Front and Back Sectors";
-			prefix = "(99)";
-			flags8192text = "[13] Use front side offsets";
-			flags32768text = "[15] Use back side offsets";
-		}
-	}
 
 	fofsolid
 	{
@@ -3299,6 +3294,192 @@ linedeftypes
 			title = "Fog Wall";
 			prefix = "(909)";
 		}
+
+		910
+		{
+			title = "100% Additive";
+			prefix = "(910)";
+		}
+
+		911
+		{
+			title = "90% Additive";
+			prefix = "(911)";
+		}
+
+		912
+		{
+			title = "80% Additive";
+			prefix = "(912)";
+		}
+
+		913
+		{
+			title = "70% Additive";
+			prefix = "(913)";
+		}
+
+		914
+		{
+			title = "60% Additive";
+			prefix = "(914)";
+		}
+
+		915
+		{
+			title = "50% Additive";
+			prefix = "(915)";
+		}
+
+		916
+		{
+			title = "40% Additive";
+			prefix = "(916)";
+		}
+
+		917
+		{
+			title = "30% Additive";
+			prefix = "(917)";
+		}
+
+		918
+		{
+			title = "20% Additive";
+			prefix = "(918)";
+		}
+
+		919
+		{
+			title = "10% Additive";
+			prefix = "(919)";
+		}
+
+		920
+		{
+			title = "100% Subtractive";
+			prefix = "(920)";
+		}
+
+		921
+		{
+			title = "90% Subtractive";
+			prefix = "(921)";
+		}
+
+		922
+		{
+			title = "80% Subtractive";
+			prefix = "(922)";
+		}
+
+		923
+		{
+			title = "70% Subtractive";
+			prefix = "(923)";
+		}
+
+		924
+		{
+			title = "60% Subtractive";
+			prefix = "(924)";
+		}
+
+		925
+		{
+			title = "50% Subtractive";
+			prefix = "(925)";
+		}
+
+		926
+		{
+			title = "40% Subtractive";
+			prefix = "(926)";
+		}
+
+		927
+		{
+			title = "30% Subtractive";
+			prefix = "(927)";
+		}
+
+		928
+		{
+			title = "20% Subtractive";
+			prefix = "(928)";
+		}
+
+		929
+		{
+			title = "10% Subtractive";
+			prefix = "(929)";
+		}
+
+		930
+		{
+			title = "100% Reverse Subtractive";
+			prefix = "(930)";
+		}
+
+		931
+		{
+			title = "90% Reverse Subtractive";
+			prefix = "(931)";
+		}
+
+		932
+		{
+			title = "80% Reverse Subtractive";
+			prefix = "(932)";
+		}
+
+		933
+		{
+			title = "70% Reverse Subtractive";
+			prefix = "(933)";
+		}
+
+		934
+		{
+			title = "60% Reverse Subtractive";
+			prefix = "(934)";
+		}
+
+		935
+		{
+			title = "50% Reverse Subtractive";
+			prefix = "(935)";
+		}
+
+		936
+		{
+			title = "40% Reverse Subtractive";
+			prefix = "(936)";
+		}
+
+		937
+		{
+			title = "30% Reverse Subtractive";
+			prefix = "(937)";
+		}
+
+		938
+		{
+			title = "20% Reverse Subtractive";
+			prefix = "(938)";
+		}
+
+		939
+		{
+			title = "10% Reverse Subtractive";
+			prefix = "(939)";
+		}
+
+		940
+		{
+			title = "Modulate";
+			prefix = "(940)";
+		}
 	}
 }
 
@@ -3654,6 +3835,7 @@ thingtypes
 			sprite = "ARCHA1";
 			width = 24;
 			height = 32;
+			flags8text = "[8] Don't jump away";
 		}
 		118
 		{
@@ -4425,7 +4607,7 @@ thingtypes
 		{
 			title = "Spikeball";
 			sprite = "SPIKA0";
-			width = 4;
+			width = 12;
 			height = 8;
 			flags8height = 24;
 			flags8text = "[8] Float";
@@ -6119,7 +6301,6 @@ thingtypes
 			sprite = "NTPNALAR";
 			width = 16;
 			height = 32;
-			flags8text = "[8] Cannot move";
 		}
 	}