Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
Ed
2025-04-30 20:31:50 +03:00
2053 changed files with 113995 additions and 38376 deletions

View File

@@ -16,7 +16,7 @@
- id: GiftsVendingRestock
# Game Rules
- type: entity
id: CargoGiftsBase
parent: BaseGameRule
@@ -213,3 +213,4 @@
SecurityRiot: 2
SecurityRestraints: 2
SecurityNonLethal: 2
SecurityNonlethalThrowables: 1

View File

@@ -447,3 +447,5 @@
orGroup: puddleMess
- id: SmugglerStashVariationPass
prob: 0.90
- id: SolarPanelDamageVariationPass
- id: SolarPanelEmptyVariationPass

View File

@@ -20,7 +20,7 @@
definitions:
- prefRoles: [ Thief ]
max: 3
playerRatio: 15
playerRatio: 20
lateJoinAdditional: true
allowNonHumans: true
multiAntagSetting: NotExclusive

View File

@@ -123,3 +123,25 @@
blacklist:
components:
- ParticleAcceleratorControlBox
- type: entity
id: SolarPanelDamageVariationPass
parent: BaseVariationPass
components:
- type: SolarPanelReplaceVariationPass
- type: EntityReplaceVariationPass
entitiesPerReplacementAverage: 30
entitiesPerReplacementStdDev: 5
replacements:
- id: SolarPanelBroken
- type: entity
id: SolarPanelEmptyVariationPass
parent: BaseVariationPass
components:
- type: SolarPanelReplaceVariationPass
- type: EntityReplaceVariationPass
entitiesPerReplacementAverage: 30
entitiesPerReplacementStdDev: 5
replacements:
- id: SolarAssembly