Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Понижаем накал на сменах #428

Merged
merged 3 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions Content.Shared/CCVar/CCVars.cs
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,10 @@ public static readonly CVarDef<bool>
CVarDef.Create("traitor.min_players", 5);

public static readonly CVarDef<int> TraitorMaxTraitors =
CVarDef.Create("traitor.max_traitors", 12); // Assuming average server maxes somewhere from like 50-80 people
CVarDef.Create("traitor.max_traitors", 6); // Assuming average server maxes somewhere from like 50-80 people

public static readonly CVarDef<int> TraitorPlayersPerTraitor =
CVarDef.Create("traitor.players_per_traitor", 10);
CVarDef.Create("traitor.players_per_traitor", 12);

public static readonly CVarDef<int> TraitorCodewordCount =
CVarDef.Create("traitor.codeword_count", 4);
Expand Down
Binary file added Resources/Audio/BoomBox/barotrauma.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/borat.ogg
Binary file not shown.
18 changes: 18 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -412,3 +412,21 @@
- id: BoomBoxTapeGaster
sound:
path: /Audio/Effects/unwrap.ogg

- type: entity
parent: BaseBoomBoxTape
id: ADTBoomBoxTapeBorat
name: The Wizard
description: It is said that this tape can summon a wizard...
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/borat.ogg

- type: entity
parent: BaseBoomBoxTape
id: ADTBoomBoxTapeBarotrauma
name: The Wizard
description: It is said that this tape can summon a wizard...
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/barotrauma.ogg
9 changes: 4 additions & 5 deletions Resources/Prototypes/secret_weights.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
- type: weightedRandom
id: Secret
weights:
Nukeops: 0.15
Traitor: 0.55
Zombie: 0.10
Survival: 0.10
#Extended: 0.05 # Corvax-MRP
Nukeops: 0.1
Traitor: 0.70
Zombie: 0.05
Survival: 0.05
Revolutionary: 0.10
Loading