Merge remote-tracking branch 'origin/main'

This commit is contained in:
Gurge44 committed 2026-11-08 16:57:49 +01:00
commit 3861754eff
5 files changed
+6 -15

No files matched your search

+2 -1
View File
@@ -1931,7 +1931,7 @@ internal static class CustomRolesHelper
CustomRoles.BananaMan when pc.Is(CustomRoles.Disco) || pc.Is(CustomRoles.Doppelganger) => false,
CustomRoles.Disco when pc.GetCustomRole() is CustomRoles.Chameleon or CustomRoles.Swooper or CustomRoles.Wraith or CustomRoles.Alchemist or CustomRoles.Doppelganger => false,
CustomRoles.Egoist when pc.Is(CustomRoles.Gangster) => false,
CustomRoles.Nimble when pc.GetCustomRole() is CustomRoles.Oxyman or CustomRoles.EngineerEHR or CustomRoles.Mechanic => false,
CustomRoles.Nimble when pc.GetCustomRole() is CustomRoles.Oxyman or CustomRoles.EngineerEHR or CustomRoles.Mechanic or CustomRoles.ScientistEHR or CustomRoles.Doctor or CustomRoles.Tracefinder or CustomRoles.Sunnyboy => false,
CustomRoles.Magnet when pc.Is(Team.Impostor) => false,
CustomRoles.Swift when pc.Is(CustomRoles.Magnet) => false,
CustomRoles.Oblivious when pc.Is(CustomRoles.Amnesiac) && Amnesiac.RememberMode.GetValue() == 0 => false,
@@ -2025,6 +2025,7 @@ internal static class CustomRolesHelper
CustomRoles.Coroner when pc.Is(CustomRoles.Oblivious) => false,
CustomRoles.Fragile when pc.Is(CustomRoles.Detour) => false,
CustomRoles.Physicist when pc.GetCustomRole() is CustomRoles.Tracefinder or CustomRoles.Doctor => false,
CustomRoles.Oblivious when pc.GetCustomRole() is CustomRoles.Looter or CustomRoles.Sleuth or CustomRoles.Absorber => false,
CustomRoles.DoubleShot when pc.GetCustomRole() is not CustomRoles.EvilGuesser and not CustomRoles.NiceGuesser and not CustomRoles.Augur && !Options.GuesserMode.GetBool() => false,
CustomRoles.DoubleShot when !pc.Is(CustomRoles.Guesser) && !pc.Is(CustomRoles.EvilGuesser) && pc.Is(CustomRoleTypes.Impostor) && !Options.ImpostorsCanGuess.GetBool() => false,
CustomRoles.DoubleShot when !pc.Is(CustomRoles.Guesser) && !pc.Is(CustomRoles.NiceGuesser) && pc.Is(CustomRoleTypes.Crewmate) && !Options.CrewmatesCanGuess.GetBool() => false,
+1 -1
View File
@@ -1836,7 +1836,7 @@ public static class Options
EnableAutoMessage = new BooleanOptionItem(19429, "EnableAutoMessage", false, TabGroup.SystemSettings)
.SetHeader(true);
AutoMessageSendInterval = new IntegerOptionItem(19430, "AutoMessageSendInterval", new(10, 300, 5), 60, TabGroup.SystemSettings)
AutoMessageSendInterval = new IntegerOptionItem(19430, "AutoMessageSendInterval", new(10, 600, 5), 60, TabGroup.SystemSettings)
.SetParent(EnableAutoMessage)
.SetValueFormat(OptionFormat.Seconds);
+1 -1
View File
@@ -80,7 +80,7 @@ internal static class AllMapIconsPatch
}
}
[HarmonyPatch(typeof(StringOption), nameof(StringOption.Start))]
[HarmonyPatch(typeof(StringOption), nameof(StringOption.Initialize))]
public static class AutoselectDleksPatch
{
public static void Postfix(StringOption __instance)
-12
View File
@@ -21,18 +21,6 @@ public static class MovingPlatformBehaviourPatch
}
}
[HarmonyPatch(nameof(MovingPlatformBehaviour.IsDirty), MethodType.Getter)]
[HarmonyPrefix]
public static bool GetIsDirtyPrefix(ref bool __result)
{
if (IsDisabled)
{
__result = false;
return false;
}
return true;
}
[HarmonyPatch(nameof(MovingPlatformBehaviour.Use), typeof(PlayerControl))]
[HarmonyPrefix]
+2
View File
@@ -130,6 +130,8 @@ signingwry#3704 | 800955a89 | | slurs in game |
stoneredox#2794 | 763ef0db5 | | slurs in game |
loanlyric#0220 | f6b3f13ad | | slurs in game |
eagertest#0674 | 076364d50 | Wissal | n word in game |
sloepocket#8428 | fadd94242 | | slurs in game |
## Griefers, Toxic, Harrasing, Racist