Ed ef6d973301 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

2025-04-30 20:31:50 +03:00

..

PlantMetabolism

Fix Long Produce Time After De-aging A Plant with cryoxadone. (#34668)

2025-04-19 09:43:05 -04:00

StatusEffects

…

AddToSolutionReaction.cs

Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)

2024-09-02 13:26:04 +02:00

AdjustAlert.cs

…

AdjustReagent.cs

…

AdjustTemperature.cs

…

AreaReactionEffect.cs

Entity effects warnings cleanup (#36166)

2025-04-14 13:58:53 +10:00

ArtifactUnlock.cs

Restore Artifexium Effect (#36595)

2025-04-16 00:49:58 +02:00

CauseZombieInfection.cs

…

ChemCleanBloodstream.cs

…

ChemHealEyeDamage.cs

…

ChemVomit.cs

…

CreateEntityReactionEffect.cs

…

CreateGas.cs

…

CureZombieInfection.cs

…

Drunk.cs

…

Electrocute.cs

Modular weapon inlay (#903)

2025-02-16 11:41:43 +03:00

Emote.cs

…

EmpReactionEffect.cs

…

ExplosionReactionEffect.cs

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

ExtinguishReaction.cs

Fire extinguishers can now extinguish items, including when held/worn (#36267)

2025-04-14 19:00:47 +10:00

FlammableReaction.cs

Make Ignite tryget flammablecomp (#34970)

2025-02-08 11:56:44 +01:00

Glow.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

HealthChange.cs

Add ability for +VVEDIT users to scale damage/healing in the game (#35255)

2025-02-18 08:28:42 +01:00

Ignite.cs

Make Ignite tryget flammablecomp (#34970)

2025-02-08 11:56:44 +01:00

MakeSentient.cs

…

ModifyBleedAmount.cs

…

ModifyBloodLevel.cs

…

ModifyLungGas.cs

Quick warning fixes (#31694)

2024-09-01 04:54:39 +02:00

MovespeedModifier.cs

Entity effects warnings cleanup (#36166)

2025-04-14 13:58:53 +10:00

Oxygenate.cs

…

Paralyze.cs

…

PlantChangeStat.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

PlantMutateChemicals.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

PlantMutateGases.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

PlantMutateHarvest.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

PlantSpeciesChange.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

Polymorph.cs

Quick warning fixes (#31694)

2024-09-01 04:54:39 +02:00

PopupMessage.cs

…

ReduceRotting.cs

…

ResetNarcolepsy.cs

…

SatiateHunger.cs

…

SatiateThirst.cs

…

Slipify.cs

Botany Rework Part 1: Mutations (#31163)

2024-09-14 20:12:17 -07:00

SolutionTemperatureEffects.cs

…

WashCreamPieReaction.cs

…

WearableReaction.cs

…