mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-01-19 16:14:44 +00:00
Merge branch 'Dev' into Stable
This commit is contained in:
commit
002ef81e53
|
|
@ -867,7 +867,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
|
||||||
messageClient(%client, "", "\c2Mines are disabled at this time.");
|
messageClient(%client, "", "\c2Mines are disabled at this time.");
|
||||||
|
|
||||||
if(!%isAdmin || (%isAdmin && %client.ForceVote))
|
if(!%isAdmin || (%isAdmin && %client.ForceVote))
|
||||||
%msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode.";
|
%msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 1 ? "enable" : "disable") @ " one mine mode.";
|
||||||
|
|
||||||
case "showServerRules":
|
case "showServerRules":
|
||||||
if (($Host::ServerRules[1] !$= "") && (!%client.CantView))
|
if (($Host::ServerRules[1] !$= "") && (!%client.CantView))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue