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

..

Chemistry

Chemical reaction refactor (#2936)

2021-01-07 17:31:43 +11:00

GameObjects/Components/Interaction

Merge branch 'master-upstream' into expl_int_analyzer

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

IModuleManager.cs

Fix namespaces and optimize imports (#1651)

2020-08-13 14:40:27 +02:00

ISharedNotifyManager.cs

Replace every usage of GridCoordinates with EntityCoordinates (#2021)

2020-09-06 16:11:53 +02:00