From b6db7e92beab25704ce4f0f44debf085841030d1 Mon Sep 17 00:00:00 2001
From: ike709 <ike709@github.com>
Date: Sun, 13 Sep 2026 10:44:54 -0500
Subject: [PATCH 1/2] Drop `SoftReservedKeyword` to `warning` by default

---
 DMCompiler/Compiler/CompilerError.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DMCompiler/Compiler/CompilerError.cs b/DMCompiler/Compiler/CompilerError.cs
index bcd9784a24..cb8704f00e 100644
--- a/DMCompiler/Compiler/CompilerError.cs
+++ b/DMCompiler/Compiler/CompilerError.cs
@@ -146,7 +146,7 @@ public struct CompilerEmission {
         {WarningCode.ErrorRecoveryActivated, ErrorLevel.Error},
 
         //2000-2999
-        {WarningCode.SoftReservedKeyword, ErrorLevel.Error},
+        {WarningCode.SoftReservedKeyword, ErrorLevel.Warning},
         {WarningCode.ScopeOperandNamedType, ErrorLevel.Warning},
         {WarningCode.DuplicateVariable, ErrorLevel.Warning},
         {WarningCode.DuplicateProcDefinition, ErrorLevel.Error},

From 2fb89f9221d2204c1a18a32f4f391773e10d0e9e Mon Sep 17 00:00:00 2001
From: ike709 <ike709@github.com>
Date: Mon, 14 Sep 2026 19:03:47 -0500
Subject: [PATCH 2/2] fix tests

---
 Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword1.dm | 3 +++
 Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword2.dm | 3 +++
 Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword3.dm | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword1.dm b/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword1.dm
index 47250b1169..a9f4533aaa 100644
--- a/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword1.dm
+++ b/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword1.dm
@@ -1,5 +1,8 @@
 //COMPILE ERROR OD2000
 // NOBYOND
+
+#pragma SoftReservedKeyword error
+
 var/src = 321
 
 /proc/RunTest()
diff --git a/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword2.dm b/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword2.dm
index 5e92c59b3d..215686f099 100644
--- a/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword2.dm
+++ b/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword2.dm
@@ -1,5 +1,8 @@
 //COMPILE ERROR OD2000
 // NOBYOND
+
+#pragma SoftReservedKeyword error
+
 /proc/test(args)
 	return 1
 
diff --git a/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword3.dm b/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword3.dm
index 8e833b0fa2..07a2955352 100644
--- a/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword3.dm
+++ b/Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword3.dm
@@ -1,5 +1,8 @@
 //COMPILE ERROR OD2000
 // NOBYOND
+
+#pragma SoftReservedKeyword error
+
 /proc/RunTest()
 	var/usr = 123
 	world.log << "fail"