Merge remote-tracking branch 'refs/remotes/wizards/master'

# Conflicts:
#	Resources/Prototypes/GameRules/midround.yml
This commit is contained in:
VigersRay 2024-07-27 10:58:04 +03:00
commit f4aab88e9c
2 changed files with 12 additions and 12 deletions

View file

@ -1,11 +1,4 @@
Entries:
- author: Morb0
changes:
- message: Added emote panel (by default Y)
type: Add
id: 6490
time: '2024-04-29T04:38:23.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/26702
- author: MilenVolf
changes:
- message: Borgs now have brand new voice and walking sounds.
@ -3781,3 +3774,10 @@
id: 6989
time: '2024-07-27T04:09:24.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30249
- author: Plykiya
changes:
- message: Thief game rule now properly selects more than one thief.
type: Fix
id: 6990
time: '2024-07-27T07:27:21.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30393

View file

@ -8,9 +8,9 @@
- EscapeThiefShuttleObjective
- type: AntagRandomObjectives
sets:
# - groups: ThiefBigObjectiveGroups
# prob: 0.7
# maxPicks: 1 Воры не воруют бесполезные вещи.
- groups: ThiefBigObjectiveGroups
prob: 0.7
maxPicks: 1
- groups: ThiefObjectiveGroups
maxPicks: 10
maxDifficulty: 2.5
@ -18,8 +18,8 @@
agentName: thief-round-end-agent-name
definitions:
- prefRoles: [ Thief ]
max: 5
playerRatio: 15
max: 15
playerRatio: 13
lateJoinAdditional: true
allowNonHumans: true
multiAntagSetting: NotExclusive