Merge remote-tracking branch 'origin/main'

This commit is contained in:
Gurge44 committed 2025-09-18 15:35:27 +02:00
commit 51c415d761
4 files changed
+5 -13

No files matched your search

+3 -2
View File
@@ -678,7 +678,7 @@ public class Main : BasePlugin
{ CustomRoles.Physicist, "#87e9ff" },
{ CustomRoles.Finder, "#32a879" },
{ CustomRoles.Noisy, "#e34fb2" },
{ CustomRoles.Examiner, "#625EEE" },
{ CustomRoles.Examiner, "#326ac9" },
{ CustomRoles.Venom, "#ff1919" },
{ CustomRoles.Torch, "#eee5be" },
{ CustomRoles.Seer, "#61b26c" },
@@ -1168,4 +1168,5 @@ public enum TieMode
Random
}
public class Coroutines : MonoBehaviour { }
public class Coroutines : MonoBehaviour { }
-4
View File
@@ -3836,7 +3836,3 @@ internal static class RpcSendChatPatch
return false;
}
}
-3
View File
@@ -211,6 +211,3 @@ internal static class AuthTimeoutPatch
#endif
}
+2 -4
View File
@@ -55,9 +55,7 @@ internal static class ControllerManagerUpdatePatch
else
InGameRoleInfoMenu.Hide();
bool admin = ChatCommands.IsPlayerAdmin(PlayerControl.LocalPlayer.FriendCode);
if (KeysDown(KeyCode.Return, KeyCode.C, KeyCode.LeftShift) && admin)
if (KeysDown(KeyCode.Return, KeyCode.C, KeyCode.LeftShift))
HudManager.Instance.Chat.SetVisible(true);
if (KeysDown(KeyCode.F11, KeyCode.LeftAlt))
@@ -92,6 +90,7 @@ internal static class ControllerManagerUpdatePatch
if (KeysDown(KeyCode.LeftAlt, KeyCode.C) && !Input.GetKey(KeyCode.LeftShift) && !GameStates.IsNotJoined)
Utils.CopyCurrentSettings();
bool admin = ChatCommands.IsPlayerAdmin(PlayerControl.LocalPlayer.FriendCode);
if (!AmongUsClient.Instance.AmHost && !admin) return;
if (KeysDown(KeyCode.Return, KeyCode.L, KeyCode.LeftShift) && GameStates.IsInGame)
@@ -454,4 +453,3 @@ public static class InGameRoleInfoMenu
}
}