Paul 856b293d87 Merge branch 'master-upstream' into expl_int_analyzer ...

# Conflicts:
#	Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs
#	Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs
#	Content.Server/GameObjects/Components/Chemistry/PillComponent.cs
#	Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
#	Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
#	Content.Server/GameObjects/Components/Items/RCD/RCDAmmoComponent.cs
#	Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
#	Content.Server/GameObjects/Components/Medical/HealingComponent.cs
#	Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs
#	Content.Shared/Chemistry/Solution.cs

2021-02-04 17:50:28 +01:00

..

Behavior

You now stop breathing while in crit.

2021-01-24 16:38:01 +01:00

Circulatory

SolutionContainer refactors (#2954)

2021-01-10 19:41:55 +11:00

Part

Merge branch 'master-upstream' into expl_int_analyzer

2021-02-04 17:50:28 +01:00

Respiratory

Add Smoke and Foam chemical reaction effects. (#2913)

2021-02-03 15:26:46 +01:00

Surgery

A big hecking chemistry-related refactor. (#3055)

2021-02-04 00:05:31 +11:00

BodyComponent.cs

Console Unify API Changes (#3059)

2021-02-01 16:49:43 -08:00

BodyManagerHealthChangeParams.cs

Damage rework (#2525)

2020-12-07 14:52:55 +01:00

BodyScannerComponent.cs

Update components to use EnsureWarn (#2676)

2020-12-04 13:26:54 +01:00

MechanismComponent.cs

A big hecking chemistry-related refactor. (#3055)

2021-02-04 00:05:31 +11:00