diff --git a/resources/Rust.opj b/resources/Rust.opj
index 3dd8d4eee..9bef21a5c 100644
--- a/resources/Rust.opj
+++ b/resources/Rust.opj
@@ -1,6 +1,6 @@
 {
   "Name": "Rust",
-  "TargetDirectory": "D:\\Servers\\Rust\\RustDedicated_Data\\Managed",
+  "TargetDirectory": "D:\\Servers\\Rust-Staging\\RustDedicated_Data\\Managed",
   "Manifests": [
     {
       "AssemblyName": "Assembly-CSharp.dll",
@@ -548,7 +548,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "6IKnJq/dRRrxEi9gGFR1hutiYl/uVSFOPa8p7BZ0rhQ=",
+            "MSILHash": "u89Q9+0Zao1zHznNff6YEOKjp1YGw0tmRsVklHZ+B24=",
             "HookCategory": "Player"
           }
         },
@@ -598,7 +598,7 @@
                 "Network.Connection"
               ]
             },
-            "MSILHash": "aurXCownQbiR8Gt6tM55yldwfLt97s6tqokxAVipvbA=",
+            "MSILHash": "cIoH4dq1zCI4pRKe/AOpYzSNRpvYzDFo5J3bAQA4R5Q=",
             "HookCategory": "Player"
           }
         },
@@ -971,7 +971,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "aKp4Pd1NE7Z61ZyLUNK9jAaYyITwPGOUMpew6fdf0v8=",
+            "MSILHash": "OfEpVtrTtguZFEFeISkOV8H5NFjXbImLQNhAGIKMqoA=",
             "HookCategory": "Player"
           }
         },
@@ -1069,7 +1069,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "OWjo9jYJuaKn0KRlE5+tAvOv9xzvvtXZGu52XXvqC/o=",
+            "MSILHash": "Xk1yt3UguV2nAhjhyGzsx72rIEOKRfQ8b7y3E1YdTgQ=",
             "HookCategory": "Weapon"
           }
         },
@@ -1290,7 +1290,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "yJQYp4MaEk0C62LUmXykPxSUQwltIzSmyGMVDnO2gYg=",
+            "MSILHash": "eIojI7yATdCJZdXqsPblqStJ14pj1pk5C6UYIOYg5vs=",
             "HookCategory": "Weapon"
           }
         },
@@ -1788,7 +1788,7 @@
                 "ProtoBuf.CreateBuilding"
               ]
             },
-            "MSILHash": "R885Xll/XXIGR4VjOjxDZ/wi9n8EJTe8nX9f63S8tOI=",
+            "MSILHash": "9+R3uqOK+SGdE3PgD6U3aZyRpED0vygMmgNr5eEiHN4=",
             "HookCategory": "Structure"
           }
         },
@@ -2271,7 +2271,7 @@
                 "Network.Message"
               ]
             },
-            "MSILHash": "f+Dm008cuhtqlNOHXkX/E4oi3C59C5n+3xheXvPcTUs=",
+            "MSILHash": "PoPgf9ss4dKADcj4h9FZwdzS51mPTzDE2NgmDMyal3w=",
             "HookCategory": "Player"
           }
         },
@@ -2297,7 +2297,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "/7kGxxPTJn9z7IDshCW0aVoFkgdUXPvD0jIgyh53N4g=",
+            "MSILHash": "g6Ll9JMG+FlVqi0GXbG9tVCPWbat803YHg3Od9BAZKM=",
             "HookCategory": "Server"
           }
         },
@@ -2345,7 +2345,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "/7kGxxPTJn9z7IDshCW0aVoFkgdUXPvD0jIgyh53N4g=",
+            "MSILHash": "g6Ll9JMG+FlVqi0GXbG9tVCPWbat803YHg3Od9BAZKM=",
             "BaseHookName": "OnNewSave",
             "HookCategory": "Server"
           }
@@ -2851,7 +2851,7 @@
                 "ItemDefinition"
               ]
             },
-            "MSILHash": "Bb1PH+L0l3qfBem5+e+l6L/54sDGCFTOVx8DSjPMEPw=",
+            "MSILHash": "+njdsTJpMQ35x6my3TmNTY6nrR2JGy1ONi2Y5WM/aPU=",
             "HookCategory": "Vending"
           }
         },
@@ -4139,7 +4139,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "SuNrF72LOANL27M7jAUrE138tpsXE1q3ytLTHkmHRII=",
+            "MSILHash": "k0ZxtRxvZvY4ZeuCo2Umo8/BrJOhREAC40ZGgPl8Nx0=",
             "HookCategory": "Vehicle"
           }
         },
@@ -4161,7 +4161,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "sOvtkgdHmF6J+MVdhfTEpxI/XRgJN0KK2/Z7w2eLuwQ=",
+            "MSILHash": "ZEfC72hzrKW1ET1Bw3CJCeA2I4y99X537nylplUwJs8=",
             "HookCategory": "Vehicle"
           }
         },
@@ -4659,7 +4659,7 @@
                 "System.Byte[]"
               ]
             },
-            "MSILHash": "o45zBzoiamf1pDDEiMOSFxmDM9KkMiiTNfeBNKu1fC8=",
+            "MSILHash": "FCL6/lgHxi1t70G9QEOJFOgis3XUoSKt0HH4wVM16hw=",
             "HookCategory": "Player"
           }
         },
@@ -5068,7 +5068,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "aKp4Pd1NE7Z61ZyLUNK9jAaYyITwPGOUMpew6fdf0v8=",
+            "MSILHash": "OfEpVtrTtguZFEFeISkOV8H5NFjXbImLQNhAGIKMqoA=",
             "BaseHookName": "OnPlayerTick",
             "HookCategory": "Player"
           }
@@ -5456,7 +5456,7 @@
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 187,
+            "InjectionIndex": 190,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "this, l11",
@@ -5472,7 +5472,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "EndexDYwSER2LXrToE/QgnNQnu7c2rdaXBLC2qzozgI=",
+            "MSILHash": "251tn7HnuErMCNM7Xh9i/f3ybUdEiaHIvCkh1uabUCY=",
             "HookCategory": "Weapon"
           }
         },
@@ -6224,7 +6224,7 @@
                 "System.String"
               ]
             },
-            "MSILHash": "9YnRkDfpJGkYsGQUfXUBDINpmZ1jT6ZfAa1hYiOfIq8=",
+            "MSILHash": "PU7GsIuxo5IsszzAC2LvPh7qwpjXZfKkCwtmeiyM2/A=",
             "HookCategory": "Player"
           }
         },
@@ -6480,7 +6480,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "hiY/4wmx577jBUpT1JW/FzHAeyqXl9VGJ7RdxxK6TiA=",
+            "MSILHash": "tiMfblAUcr1oaHvQp/UhZaMKz1G2pWnRUIO+JzMItkI=",
             "HookCategory": "Vending"
           }
         },
@@ -8937,14 +8937,14 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "Ps+S/jbRmeh6QCGwN4UVx+mGofj4alsQD3+6Dt7odXA=",
+            "MSILHash": "CKl24WA30oaooLPtRWgXc19u+Rm7g4EbNr+C+haPMLw=",
             "HookCategory": "Player"
           }
         },
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 63,
+            "InjectionIndex": 83,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "this, l0",
@@ -8962,7 +8962,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "Ps+S/jbRmeh6QCGwN4UVx+mGofj4alsQD3+6Dt7odXA=",
+            "MSILHash": "CKl24WA30oaooLPtRWgXc19u+Rm7g4EbNr+C+haPMLw=",
             "BaseHookName": "OnMapMarkerAdd",
             "HookCategory": "Player"
           }
@@ -9047,7 +9047,7 @@
         {
           "Type": "Modify",
           "Hook": {
-            "InjectionIndex": 43,
+            "InjectionIndex": 37,
             "RemoveCount": 0,
             "Instructions": [
               {
@@ -9060,8 +9060,9 @@
                 "OpType": "None"
               },
               {
-                "OpCode": "ldloc_3",
-                "OpType": "None"
+                "OpCode": "ldloc_s",
+                "OpType": "VariableIndex",
+                "Operand": "4"
               },
               {
                 "OpCode": "call",
@@ -9071,7 +9072,7 @@
               {
                 "OpCode": "brtrue_s",
                 "OpType": "Instruction",
-                "Operand": 75
+                "Operand": 89
               }
             ],
             "HookTypeName": "Modify",
@@ -9086,7 +9087,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "KHomtyu8drHj/8AWQ1llVVAgNsGh4LnqdorfelAE0es=",
+            "MSILHash": "bW24nWSObr9RZF3z2CJAAtXhyXANUOczNXRu78bE05c=",
             "HookCategory": "Electronic"
           }
         },
@@ -9400,7 +9401,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "A+3z7YVZ8nqdd/5/Q9nz+Ni9cIIBgP1n03m6ItHg6EQ=",
+            "MSILHash": "s4ZIu9smoZa4RaqoOHZR/C405B8amQGktFRpCm+pkKk=",
             "HookCategory": "Bookmark"
           }
         },
@@ -9500,7 +9501,7 @@
                 "BasePlayer"
               ]
             },
-            "MSILHash": "qfFh//tIY8e2980IZXrBYGTh/ryFhld6Jqn9z/080J0=",
+            "MSILHash": "FV4pqFbVjjDd4UZqbbvoIfFGA12TvbDKZ1CcTuDriiI=",
             "HookCategory": "Bookmark"
           }
         },
@@ -9762,7 +9763,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "FF/HThjGvrNfEpHr3h5Q5T1aU5nFHfwpjxAdZFj0P5c=",
+            "MSILHash": "3Bod3/TTyIJZbyAoEJOG2Uv0DYcmWCvomVJm+jXvdvc=",
             "HookCategory": "Player"
           }
         },
@@ -9791,7 +9792,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "FF/HThjGvrNfEpHr3h5Q5T1aU5nFHfwpjxAdZFj0P5c=",
+            "MSILHash": "3Bod3/TTyIJZbyAoEJOG2Uv0DYcmWCvomVJm+jXvdvc=",
             "BaseHookName": "OnPlayerCorpseSpawn",
             "HookCategory": "Player"
           }
@@ -9845,7 +9846,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "zCRbD2WU3Uwpy5uVvfkjt+tC/sf/Xa5NhIzrvzq9HxE=",
+            "MSILHash": "tbvMDN+W3Fm0f+wipoJFEcebqC8/vF34PbLmndVoKhc=",
             "HookCategory": "Radio"
           }
         },
@@ -9871,7 +9872,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "JjX6nZLtX9i0DqfG7oXEZMLnmMaOhhNzdisTBOqrIRU=",
+            "MSILHash": "uXx7/CZE9VsyNqpX2/XeiU84eJGZIJePF9MiqUqkk3k=",
             "HookCategory": "Radio"
           }
         },
@@ -9897,7 +9898,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "gnsZ82ZFJ6ClZTlahQV2MAhFTmGmHrBB/9PWjnw7BME=",
+            "MSILHash": "2A8K2RiQQHheEN5vu3fYUMJAvJy/tc4I8tZCy4Dq1+Q=",
             "HookCategory": "Radio"
           }
         },
@@ -9923,14 +9924,14 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "BXFCfnu2faJ5vFVYjW2y34elKrqqTQYtBS2d/zFQXOo=",
+            "MSILHash": "Rw7L34as6nw8x7YCqaqOnkUwXyiiOs4Qedq+D3nirmg=",
             "HookCategory": "Radio"
           }
         },
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 24,
+            "InjectionIndex": 34,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "a1, a0",
@@ -9949,7 +9950,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "gnsZ82ZFJ6ClZTlahQV2MAhFTmGmHrBB/9PWjnw7BME=",
+            "MSILHash": "2A8K2RiQQHheEN5vu3fYUMJAvJy/tc4I8tZCy4Dq1+Q=",
             "BaseHookName": "OnRfBroadcasterAdd",
             "HookCategory": "Radio"
           }
@@ -9957,7 +9958,7 @@
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 25,
+            "InjectionIndex": 19,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "a1, a0",
@@ -9976,7 +9977,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "JjX6nZLtX9i0DqfG7oXEZMLnmMaOhhNzdisTBOqrIRU=",
+            "MSILHash": "uXx7/CZE9VsyNqpX2/XeiU84eJGZIJePF9MiqUqkk3k=",
             "BaseHookName": "OnRfListenerRemove",
             "HookCategory": "Radio"
           }
@@ -9984,7 +9985,7 @@
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 26,
+            "InjectionIndex": 29,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "a1, a0",
@@ -10003,7 +10004,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "zCRbD2WU3Uwpy5uVvfkjt+tC/sf/Xa5NhIzrvzq9HxE=",
+            "MSILHash": "tbvMDN+W3Fm0f+wipoJFEcebqC8/vF34PbLmndVoKhc=",
             "BaseHookName": "OnRfListenerAdd",
             "HookCategory": "Radio"
           }
@@ -10011,7 +10012,7 @@
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 24,
+            "InjectionIndex": 36,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "a1, a0",
@@ -10030,7 +10031,7 @@
                 "IRFObject"
               ]
             },
-            "MSILHash": "BXFCfnu2faJ5vFVYjW2y34elKrqqTQYtBS2d/zFQXOo=",
+            "MSILHash": "Rw7L34as6nw8x7YCqaqOnkUwXyiiOs4Qedq+D3nirmg=",
             "BaseHookName": "OnRfBroadcasterRemove",
             "HookCategory": "Radio"
           }
@@ -12937,7 +12938,7 @@
                 "MarketTerminal"
               ]
             },
-            "MSILHash": "jhaDzde0Dxdxkreg86olWROId+GE8K/uilEhr+ymqhc=",
+            "MSILHash": "uVFDPc4PcncUaM9E1bBxO3Vt3DO0rfq7Nvqa418Kdp8=",
             "HookCategory": "Vending"
           }
         },
@@ -12993,7 +12994,7 @@
         {
           "Type": "Simple",
           "Hook": {
-            "InjectionIndex": 148,
+            "InjectionIndex": 147,
             "ReturnBehavior": 0,
             "ArgumentBehavior": 4,
             "ArgumentString": "this, l0, l1, l2",
@@ -13011,7 +13012,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "A+3z7YVZ8nqdd/5/Q9nz+Ni9cIIBgP1n03m6ItHg6EQ=",
+            "MSILHash": "s4ZIu9smoZa4RaqoOHZR/C405B8amQGktFRpCm+pkKk=",
             "BaseHookName": "OnBookmarkControl",
             "HookCategory": "Bookmark"
           }
@@ -13037,7 +13038,7 @@
                 "BasePlayer"
               ]
             },
-            "MSILHash": "qfFh//tIY8e2980IZXrBYGTh/ryFhld6Jqn9z/080J0=",
+            "MSILHash": "FV4pqFbVjjDd4UZqbbvoIfFGA12TvbDKZ1CcTuDriiI=",
             "BaseHookName": "OnBookmarkControlEnd",
             "HookCategory": "Bookmark"
           }
@@ -13282,7 +13283,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "A+3z7YVZ8nqdd/5/Q9nz+Ni9cIIBgP1n03m6ItHg6EQ=",
+            "MSILHash": "s4ZIu9smoZa4RaqoOHZR/C405B8amQGktFRpCm+pkKk=",
             "BaseHookName": "OnBookmarkControlStarted",
             "HookCategory": "Bookmark"
           }
@@ -13313,7 +13314,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "A+3z7YVZ8nqdd/5/Q9nz+Ni9cIIBgP1n03m6ItHg6EQ=",
+            "MSILHash": "s4ZIu9smoZa4RaqoOHZR/C405B8amQGktFRpCm+pkKk=",
             "BaseHookName": "OnBookmarkControlEnded [2]",
             "HookCategory": "Bookmark"
           }
@@ -13421,7 +13422,7 @@
                 "BaseEntity/RPCMessage"
               ]
             },
-            "MSILHash": "yJQYp4MaEk0C62LUmXykPxSUQwltIzSmyGMVDnO2gYg=",
+            "MSILHash": "eIojI7yATdCJZdXqsPblqStJ14pj1pk5C6UYIOYg5vs=",
             "BaseHookName": "OnWeaponFired",
             "HookCategory": "_Patches"
           }
@@ -13626,10 +13627,11 @@
               "Name": "IsOwnedBy",
               "ReturnType": "System.Boolean",
               "Parameters": [
-                "BasePlayer"
+                "BasePlayer",
+                "System.Boolean"
               ]
             },
-            "MSILHash": "zPJVa7Kq9l0HJn5Hg6jbuTa74xWuBYI9V6m/UDSBbrM=",
+            "MSILHash": "VnbgAyuov/zH1klIPlpkIFc0ufyToDQRhoyaArydKyM=",
             "HookCategory": "Player"
           }
         },
@@ -13704,7 +13706,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "AZE980ACapKjyLKz5kFNU9ggksXXDp3ZrEEu6KjxwT4=",
+            "MSILHash": "jZzsoXWSEl7FH6/AsHhety1Lkp89Zzu0Hwnpjms+YiI=",
             "HookCategory": "Player"
           }
         },
@@ -14061,7 +14063,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "PmO97Qj5AzAthE4Hwrkf4y6WfSlU1qgORhoMv/lBmzQ=",
+            "MSILHash": "uBFSymfnbf0Hg1yR5aeEL16Jz/6aYYHAeXdgRPH8M+U=",
             "HookCategory": "Entity"
           }
         },
@@ -15310,7 +15312,7 @@
                 "MarketTerminal"
               ]
             },
-            "MSILHash": "jhaDzde0Dxdxkreg86olWROId+GE8K/uilEhr+ymqhc=",
+            "MSILHash": "uVFDPc4PcncUaM9E1bBxO3Vt3DO0rfq7Nvqa418Kdp8=",
             "BaseHookName": "OnVendingTransaction",
             "HookCategory": "Vending"
           }
@@ -15670,7 +15672,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "uJZVFKF2vjTHdB8yVe2ZoS67bjnNfxcGWN2FdDJ+Stc=",
+            "MSILHash": "oCEEnoeoJ7rbuXcmnSizeJFPT6KjVd+L6ijaSA0HFHc=",
             "HookCategory": "Player"
           }
         },
@@ -16097,7 +16099,7 @@
               "ReturnType": "BaseEntity",
               "Parameters": []
             },
-            "MSILHash": "VZ4frnY1YoM7+0jN3oFXXe9qXY3u6rLSEtugsUeWxHE=",
+            "MSILHash": "4sU5hHRCakdpEfUiK5A2b75so+JUgNtPuNVHEcL2sgg=",
             "HookCategory": "NPC"
           }
         },
@@ -16248,7 +16250,7 @@
                 "System.Int32"
               ]
             },
-            "MSILHash": "/2bsaQ/HHo1GS+PyvoLVbIm6xRXsqXanTwaY7dGj4O0=",
+            "MSILHash": "LrsezsU9SpwS1YPiMb2G4nK0O0hFUXZqUeck1uygURE=",
             "HookCategory": "World"
           }
         },
@@ -16543,7 +16545,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "tWX9nWMegNE1/DXkuM/AKBIgiyLunVxYgeGHTcxdk+8=",
+            "MSILHash": "bWYAy9UhZfM7z3fNqgnmarCy/RGGKZeTpjpsRGmebjo=",
             "HookCategory": "Server"
           }
         },
@@ -16593,7 +16595,7 @@
                 "BasePlayer"
               ]
             },
-            "MSILHash": "zz+zDdXWUtIgrl5/fJWhaYn9xHk2TC0DrWK8FG5ZkPQ=",
+            "MSILHash": "jPQCq/pPuNyDUp4ogOba9LdmG1XQTt/TuRwZKYFYgQc=",
             "HookCategory": "Vehicle"
           }
         },
@@ -16618,7 +16620,7 @@
                 "BasePlayer"
               ]
             },
-            "MSILHash": "zz+zDdXWUtIgrl5/fJWhaYn9xHk2TC0DrWK8FG5ZkPQ=",
+            "MSILHash": "jPQCq/pPuNyDUp4ogOba9LdmG1XQTt/TuRwZKYFYgQc=",
             "BaseHookName": "OnMlrsFire",
             "HookCategory": "Vehicle"
           }
@@ -17110,7 +17112,7 @@
             "Name": "OnNpcTargetSense",
             "HookName": "OnNpcTargetSense",
             "AssemblyName": "Assembly-CSharp.dll",
-            "TypeName": "Rust.AI.SimpleAIMemory",
+            "TypeName": "Rust.Ai.SimpleAIMemory",
             "Flagged": false,
             "Signature": {
               "Exposure": 2,
@@ -17122,7 +17124,7 @@
                 "AIBrainSenses"
               ]
             },
-            "MSILHash": "d9SI0Dg1CGNB8MMfmej1LLTh4Duec1JN9zheeJdq+Gg=",
+            "MSILHash": "xEPVl+VEqBcKHo+gm/pfDMoXaiK1Va7869PzP2q5oc8=",
             "HookCategory": "NPC"
           }
         },
@@ -17606,7 +17608,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "AjwwpQzB/Bo4WbOJVJCCMGwJNXigVn7aM23n3FqaRKs=",
+            "MSILHash": "yytVSILlYb5V+0ernEBljRUpO8DN2fzH6gebMv2RPZ4=",
             "HookCategory": "Weapon"
           }
         },
@@ -17961,7 +17963,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "jRdRXK26tDM+8J8BvwtrO7xOSlva5fERcqMXa1uVcV8=",
+            "MSILHash": "nXvpPKAZCfWlUt/MCBz/ynGQ6YQZQ5kq8mrXLo0RwpU=",
             "HookCategory": "Entity"
           }
         },
@@ -17983,7 +17985,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "jRdRXK26tDM+8J8BvwtrO7xOSlva5fERcqMXa1uVcV8=",
+            "MSILHash": "nXvpPKAZCfWlUt/MCBz/ynGQ6YQZQ5kq8mrXLo0RwpU=",
             "BaseHookName": "OnOvenStart",
             "HookCategory": "Entity"
           }
@@ -18817,7 +18819,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "H/dTiK0aVUbLyM7/P8WeQOQ4ATwA+mYfCg66fanMTS0=",
+            "MSILHash": "FpfuGmewfB1SnC7ZS41RORC3maWOQIKmHIj574YMuqw=",
             "HookCategory": "Player"
           }
         },
@@ -18830,7 +18832,7 @@
               {
                 "OpCode": "leave",
                 "OpType": "Instruction",
-                "Operand": 805
+                "Operand": 814
               }
             ],
             "HookTypeName": "Modify",
@@ -18845,7 +18847,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "H/dTiK0aVUbLyM7/P8WeQOQ4ATwA+mYfCg66fanMTS0=",
+            "MSILHash": "FpfuGmewfB1SnC7ZS41RORC3maWOQIKmHIj574YMuqw=",
             "BaseHookName": "IOnPlayerChat",
             "HookCategory": "Player"
           }
@@ -18874,7 +18876,7 @@
               "ReturnType": "System.Void",
               "Parameters": []
             },
-            "MSILHash": "H/dTiK0aVUbLyM7/P8WeQOQ4ATwA+mYfCg66fanMTS0=",
+            "MSILHash": "FpfuGmewfB1SnC7ZS41RORC3maWOQIKmHIj574YMuqw=",
             "BaseHookName": "IOnPlayerChat[patch]",
             "HookCategory": "Player"
           }
@@ -20792,7 +20794,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "1TbHAd27cEn42xidJjKldd3qAEbDOzHhEluOfklvJ14=",
+            "MSILHash": "AHcOY/MvvnVgvjWr7w+MpHAcrMbLJdC7D3qR4LEOed0=",
             "HookCategory": "NPC"
           }
         },
@@ -20943,7 +20945,7 @@
                 "System.Boolean"
               ]
             },
-            "MSILHash": "qdB4rgJqCqSdOVe2pBgH/nIcHpMbc2tgY8hsRmNhac4=",
+            "MSILHash": "2CZD9GQgqovt+OM1FUiYb+XzEHTEQMK3mF/J5nWCuS0=",
             "HookCategory": "Entity"
           }
         },
@@ -21102,6 +21104,38 @@
             "MSILHash": "fcoqKk4EobNYGkzVR4q4EVkgOZfItr4P6tOM9pGuREs=",
             "HookCategory": "NPC"
           }
+        },
+        {
+          "Type": "Modify",
+          "Hook": {
+            "InjectionIndex": 15,
+            "RemoveCount": 1,
+            "Instructions": [
+              {
+                "OpCode": "brfalse_s",
+                "OpType": "Instruction",
+                "Operand": 25
+              }
+            ],
+            "HookTypeName": "Modify",
+            "Name": "OnRfListenerRemoved [patch]",
+            "HookName": "OnRfListenerRemoved [patch]",
+            "AssemblyName": "Assembly-CSharp.dll",
+            "TypeName": "RFManager",
+            "Flagged": false,
+            "Signature": {
+              "Exposure": 2,
+              "Name": "RemoveListener",
+              "ReturnType": "System.Void",
+              "Parameters": [
+                "System.Int32",
+                "IRFObject"
+              ]
+            },
+            "MSILHash": "uXx7/CZE9VsyNqpX2/XeiU84eJGZIJePF9MiqUqkk3k=",
+            "BaseHookName": "OnRfListenerRemoved",
+            "HookCategory": "Radio"
+          }
         }
       ],
       "Modifiers": [
@@ -21797,7 +21831,7 @@
           "Flagged": false,
           "Signature": {
             "Exposure": [
-              1
+              0
             ],
             "Name": "_mounted",
             "FullTypeName": "BasePlayer BaseMountable::_mounted",
@@ -26944,25 +26978,6 @@
           },
           "MSILHash": ""
         },
-        {
-          "Name": "WaterCatcher::TestIsOutside",
-          "AssemblyName": "Assembly-CSharp.dll",
-          "TypeName": "WaterCatcher",
-          "Type": 1,
-          "TargetExposure": [
-            2
-          ],
-          "Flagged": false,
-          "Signature": {
-            "Exposure": [
-              0
-            ],
-            "Name": "TestIsOutside",
-            "FullTypeName": "System.Boolean",
-            "Parameters": []
-          },
-          "MSILHash": "Lg1iPcS6dY6bDQWnNH0ub7zZ+R7z2eL940NlkyJY8yI="
-        },
         {
           "Name": "WaterCatcher::IsFull",
           "AssemblyName": "Assembly-CSharp.dll",
@@ -41815,7 +41830,7 @@
               0
             ],
             "Name": "Memory",
-            "FullTypeName": "Rust.AI.SimpleAIMemory AIBrainSenses::Memory()",
+            "FullTypeName": "Rust.Ai.SimpleAIMemory AIBrainSenses::Memory()",
             "Parameters": []
           },
           "MSILHash": ""
diff --git a/src/Oxide.Rust.csproj b/src/Oxide.Rust.csproj
index 46b55719e..0fb27b827 100644
--- a/src/Oxide.Rust.csproj
+++ b/src/Oxide.Rust.csproj
@@ -14,7 +14,7 @@
     <TargetFramework>net48</TargetFramework>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <SteamAppId>258550</SteamAppId>
-    <SteamBranch>public</SteamBranch>
+    <SteamBranch>staging</SteamBranch>
     <SteamLogin>anonymous</SteamLogin>
     <GamePlatform>windows;linux</GamePlatform>
     <GameExe>RustDedicated.exe;RustDedicated</GameExe>