diff --git a/src/Cheats/MalumCheats.cs b/src/Cheats/MalumCheats.cs index 0b161fb..852a708 100644 --- a/src/Cheats/MalumCheats.cs +++ b/src/Cheats/MalumCheats.cs @@ -157,10 +157,18 @@ public static void murderAllCheat() { if (CheatToggles.murderAll){ - // Kill all players by sending a successful MurderPlayer RPC call - foreach (var player in PlayerControl.AllPlayerControls) - { - Utils.murderPlayer(player, MurderResultFlags.Succeeded); + if (Utils.isLobby){ + + HudManager.Instance.Notifier.AddDisconnectMessage("Killing in lobby disabled for being too buggy"); + + }else{ + + // Kill all players by sending a successful MurderPlayer RPC call + foreach (var player in PlayerControl.AllPlayerControls) + { + Utils.murderPlayer(player, MurderResultFlags.Succeeded); + } + } CheatToggles.murderAll = false; diff --git a/src/Cheats/MalumPPMCheats.cs b/src/Cheats/MalumPPMCheats.cs index de06182..a324efd 100644 --- a/src/Cheats/MalumPPMCheats.cs +++ b/src/Cheats/MalumPPMCheats.cs @@ -67,6 +67,12 @@ public static void murderPlayerPPM() CheatToggles.DisablePPMCheats("murderPlayer"); } + if (Utils.isLobby){ + HudManager.Instance.Notifier.AddDisconnectMessage("Killing in lobby disabled for being too buggy"); + CheatToggles.murderPlayer = false; + return; + } + List playerDataList = new List(); // All players are saved to playerList diff --git a/src/UI/MenuUI.cs b/src/UI/MenuUI.cs index e22cb2e..04672af 100644 --- a/src/UI/MenuUI.cs +++ b/src/UI/MenuUI.cs @@ -151,7 +151,6 @@ private void Update(){ //Some cheats only work if the ship is present, so they are turned off if it is not if(!Utils.isShip){ CheatToggles.unfixableLights = CheatToggles.completeMyTasks = CheatToggles.kickVents = CheatToggles.reportBody = CheatToggles.closeMeeting = CheatToggles.reactorSab = CheatToggles.oxygenSab = CheatToggles.commsSab = CheatToggles.elecSab = CheatToggles.mushSab = CheatToggles.doorsSab = false; - //Sabotages_ShipStatus_FixedUpdate_Postfix.reactorSab = Sabotages_ShipStatus_FixedUpdate_Postfix.commsSab = Sabotages_ShipStatus_FixedUpdate_Postfix.elecSab = Sabotages_ShipStatus_FixedUpdate_Postfix.oxygenSab = UnfixableLights_ShipStatus_FixedUpdate_Postfix.isActive = false; } }