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

No more zombie + 16:9 #641

Merged
merged 3 commits into from
Apr 23, 2024
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
4 changes: 2 additions & 2 deletions Content.Shared/CCVar/CCVars.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1571,10 +1571,10 @@ public static readonly CVarDef<int>
CVarDef.Create("viewport.minimum_width", 15, CVar.REPLICATED);

public static readonly CVarDef<int> ViewportMaximumWidth =
CVarDef.Create("viewport.maximum_width", 21, CVar.REPLICATED);
CVarDef.Create("viewport.maximum_width", 29, CVar.REPLICATED);

public static readonly CVarDef<int> ViewportWidth =
CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
CVarDef.Create("viewport.width", 29, CVar.CLIENTONLY | CVar.ARCHIVE);

/*
* UI
Expand Down
10 changes: 8 additions & 2 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1676,16 +1676,22 @@ Entries:
- {message: "Фикс спрайта церковной скамейки.", type: Fix}
id: 55732 #костыль отображения в Обновлениях
time: '2024-04-15T08:20:00.0000000+00:00'

- author: Username228
changes:
- { message: "Инженеры NanoTrasen совместно с DSW не прекращают работу, на сей раз они полностью переработали дизайн и характеристики Вархаммера.", type: Tweak}
- { message: "Инженеры Nanotrasen слегка модифицировали конструкцию глефы-крашера, увеличив её длину и слегка снизив её массу, делая её более лёгкой в использовании.", type: Tweak}
id: 55732 #костыль отображения в Обновлениях
time: '2024-04-15T02:17:00.0000000+00:00'

- author: Шрёдингер
changes:
- {message: "Возращаем старый хот бар, быстрых действий слева.", type: Tweak}
id: 55733 #костыль отображения в Обновлениях
time: '2024-04-16T08:20:00.0000000+00:00'

- author: Шрёдингер
changes:
- {message: "Акты био терроризма резко упали в количестве до нуля.", type: Remove}
id: 55734
time: '2024-04-22T08:20:00.0000000+00:00'
32 changes: 16 additions & 16 deletions Resources/Prototypes/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -420,22 +420,22 @@
- id: MobClownSpider
prob: 0.05

- type: entity
id: ZombieOutbreak
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
earliestStart: 50
minimumPlayers: 15
weight: 5
duration: 1
- type: ZombieRule
minStartDelay: 0 #let them know immediately
maxStartDelay: 10
maxInitialInfected: 3 #fewer zombies
minInitialInfectedGrace: 300 #less time to prepare
maxInitialInfectedGrace: 450
#- type: entity
# id: ZombieOutbreak
# parent: BaseGameRule
# noSpawn: true
# components:
# - type: StationEvent
# earliestStart: 50
# minimumPlayers: 15
# weight: 5
# duration: 1
# - type: ZombieRule
# minStartDelay: 0 #let them know immediately
# maxStartDelay: 10
# maxInitialInfected: 3 #fewer zombies
# minInitialInfectedGrace: 300 #less time to prepare
# maxInitialInfectedGrace: 450

- type: entity
id: LoneOpsSpawn
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/GameRules/roundstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@
components:
- type: SecretRule

- type: entity
id: Zombie
parent: BaseGameRule
noSpawn: true
components:
- type: ZombieRule
#- type: entity
# id: Zombie
# parent: BaseGameRule
# noSpawn: true
# components:
# - type: ZombieRule

# event schedulers
- type: entity
Expand Down
34 changes: 17 additions & 17 deletions Resources/Prototypes/game_presets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- Nukeops
- Traitor
- Revolutionary
- Zombie
# - Zombie
- RampingStationEventScheduler

- type: gamePreset
Expand Down Expand Up @@ -138,21 +138,21 @@
- BasicStationEventScheduler
- BasicRoundstartVariation

- type: gamePreset
id: Zombie
alias:
- zombie
- zombies
- Zombies
- zz14
- zomber
name: zombie-title
description: zombie-description
showInVote: false
rules:
- Zombie
- BasicStationEventScheduler
- BasicRoundstartVariation
#- type: gamePreset
# id: Zombie
# alias:
# - zombie
# - zombies
# - Zombies
# - zz14
# - zomber
# name: zombie-title
# description: zombie-description
# showInVote: false
# rules:
# - Zombie
# - BasicStationEventScheduler
# - BasicRoundstartVariation

- type: gamePreset
id: Pirates
Expand Down Expand Up @@ -217,7 +217,7 @@
showInVote: false
rules:
- Changeling
- Zombie
# - Zombie
- BasicStationEventScheduler
- BasicRoundstartVariation

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/secret_weights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
weights:
Nukeops: 0.15
Traitor: 0.30
Zombie: 0.05
# Zombie: 0.05
Survival: 0.05
Revolutionary: 0.1
TraitorChangeling: 0.1
Expand Down
Loading