Merge branch 'master' into DecimalReagents

This commit is contained in:
PrPleGoo
2020-04-12 14:37:36 +02:00
123 changed files with 1293 additions and 1338 deletions

View File

@@ -47,16 +47,11 @@ namespace Content.Server.GameObjects.Components.Metabolism
serializer.DataField(ref _initialMaxVolume, "maxVolume", ReagentUnit.New(250));
}
public override void Initialize()
protected override void Startup()
{
base.Initialize();
//Create and setup internal solution storage
_internalSolution = new SolutionComponent();
_internalSolution.InitializeFromPrototype();
_internalSolution.Init();
base.Startup();
_internalSolution = Owner.GetComponent<SolutionComponent>();
_internalSolution.MaxVolume = _initialMaxVolume;
_internalSolution.Owner = Owner; //Manually set owner to avoid crash when VV'ing this
}
/// <summary>