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

..

DefaultMetabolizable.cs

This is the part where I realize I forgot to fix these as part of sandboxing.

2020-11-27 01:01:56 +01:00

ReactionPrototype.cs

Merge branch 'master-upstream' into expl_int_analyzer

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

ReagentPrototype.cs

Enable nullable in ReactionPrototype & ReagentPrototype (#3005)

2021-01-15 16:40:10 +11:00

ReagentUnit.cs

Mark ReagentUnit instance methods are readonly.

2021-01-23 20:09:02 +01:00

Solution.cs

Merge branch 'master-upstream' into expl_int_analyzer

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

SolutionContainerCaps.cs

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

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