Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public void CreateStandardVote(ICommonSession? initiator, StandardVoteType voteT
break;
// WL-Changes-start
case StandardVoteType.EvacuationShuttle:
timeoutVote = false; // Allows the timeout to be updated manually in the create method
CreateVoteShuttleEvac(initiator);
break;
// WL-Changes-end
Expand Down Expand Up @@ -123,6 +124,8 @@ private void CreateVoteShuttleEvac(ICommonSession? initiator)

var vote = CreateVote(options);

TimeoutStandardVote(StandardVoteType.EvacuationShuttle, TimeSpan.FromSeconds(_cfg.GetCVar(WLCVars.VoteShuttleTimeout)));

vote.OnFinished += (_, args) =>
{
var yesVotes = vote.VotesPerOption[true];
Expand Down
6 changes: 6 additions & 0 deletions Content.Shared/_WL/CCVars/WLCCVars.Vote.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@ public sealed partial class WLCVars
/// </summary>
public static readonly CVarDef<int> VoteShuttleTimer =
CVarDef.Create("vote.evacuation_shuttle_vote_time", 40, CVar.SERVERONLY);

/// <summary>
/// Задержка между голосованиями за шаттл.
/// </summary>
public static readonly CVarDef<float> VoteShuttleTimeout =
CVarDef.Create("vote.evacuation_shuttle_vote_timeout", 1800f, CVar.SERVERONLY);
}
2 changes: 1 addition & 1 deletion Resources/Prototypes/GameRules/roundstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@
- id: SolarPanelDamageVariationPass
- id: SolarPanelEmptyVariationPass
- id: BasicDecalDirtVariationPass
- id: BasicDecalGraffitiVariationPass
# - id: BasicDecalGraffitiVariationPass # WL-Changes: Disable graffities
- id: BasicDecalBurnsVariationPass
prob: 0.50
orGroup: monospaceDecals
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/game_presets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
name: extended-title
showInVote: true #WL gamepreset vote changes
description: extended-description
minPlayers: 5 # WL-Changes: Station calmdown
rules:
- BasicStationEventScheduler
#- MeteorSwarmScheduler
Expand Down Expand Up @@ -123,6 +124,7 @@
name: secret-title
showInVote: true
description: secret-description
minPlayers: 5 # WL-Changes: Station calmdown
rules:
- Secret

Expand Down
Loading