Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch '20-11-19-sandboxing' into 20-11-27-merge

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-27 00:53:48 +01:00
parent 42214036c7 0dbb75051e
commit f29476290c
21 changed files with 174 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Shared/Atmos/GasPrototype.cs
View File

@@ -67,17 +67,17 @@ namespace Content.Shared.Atmos
{
var serializer = YamlObjectSerializer.NewReader(mapping);
serializer.DataField(this, x => ID, "id", string.Empty);
serializer.DataField(this, x => Name, "name", string.Empty);
serializer.DataField(this, x => OverlayPath, "overlayPath", string.Empty);
serializer.DataField(this, x => SpecificHeat, "specificHeat", 0f);
serializer.DataField(this, x => HeatCapacityRatio, "heatCapacityRatio", 1.4f);
serializer.DataField(this, x => MolarMass, "molarMass", 1f);
serializer.DataField(this, x => GasMolesVisible, "gasMolesVisible", 0.25f);
serializer.DataField(this, x => GasOverlayTexture, "gasOverlayTexture", string.Empty);
serializer.DataField(this, x => GasOverlaySprite, "gasOverlaySprite", string.Empty);
serializer.DataField(this, x => GasOverlayState, "gasOverlayState", string.Empty);
serializer.DataField(this, x => Color, "color", string.Empty);
serializer.DataField(this, x => x.ID, "id", string.Empty);
serializer.DataField(this, x => x.Name, "name", string.Empty);
serializer.DataField(this, x => x.OverlayPath, "overlayPath", string.Empty);
serializer.DataField(this, x => x.SpecificHeat, "specificHeat", 0f);
serializer.DataField(this, x => x.HeatCapacityRatio, "heatCapacityRatio", 1.4f);
serializer.DataField(this, x => x.MolarMass, "molarMass", 1f);
serializer.DataField(this, x => x.GasMolesVisible, "gasMolesVisible", 0.25f);
serializer.DataField(this, x => x.GasOverlayTexture, "gasOverlayTexture", string.Empty);
serializer.DataField(this, x => x.GasOverlaySprite, "gasOverlaySprite", string.Empty);
serializer.DataField(this, x => x.GasOverlayState, "gasOverlayState", string.Empty);
serializer.DataField(this, x => x.Color, "color", string.Empty);
}
}
}

3
Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs
View File

@@ -158,8 +158,7 @@ namespace Content.Shared.GameObjects.Components.Body.Mechanism
return true;
}
behavior = new T();
IoCManager.InjectDependencies(behavior);
behavior = IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance<T>();
_behaviors.Add(typeof(T), behavior);
behavior.Initialize(this);
behavior.Startup();

22
Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs
View File

@@ -64,17 +64,17 @@ namespace Content.Shared.GameObjects.Components
{
base.ExposeData(serializer);
serializer.DataField(this, x => TurnOnBehaviourID, "turnOnBehaviourID", string.Empty);
serializer.DataField(this, x => FadeOutBehaviourID, "fadeOutBehaviourID", string.Empty);
serializer.DataField(this, x => GlowDuration, "glowDuration", 60 * 15f);
serializer.DataField(this, x => FadeOutDuration, "fadeOutDuration", 60 * 5f);
serializer.DataField(this, x => SpentName, "spentName", string.Empty);
serializer.DataField(this, x => SpentDesc, "spentDesc", string.Empty);
serializer.DataField(this, x => IconStateLit, "iconStateOn", string.Empty);
serializer.DataField(this, x => IconStateSpent, "iconStateSpent", string.Empty);
serializer.DataField(this, x => LitSound, "litSound", string.Empty);
serializer.DataField(this, x => LoopedSound, "loopedSound", string.Empty);
serializer.DataField(this, x => DieSound, "dieSound", string.Empty);
serializer.DataField(this, x => x.TurnOnBehaviourID, "turnOnBehaviourID", string.Empty);
serializer.DataField(this, x => x.FadeOutBehaviourID, "fadeOutBehaviourID", string.Empty);
serializer.DataField(this, x => x.GlowDuration, "glowDuration", 60 * 15f);
serializer.DataField(this, x => x.FadeOutDuration, "fadeOutDuration", 60 * 5f);
serializer.DataField(this, x => x.SpentName, "spentName", string.Empty);
serializer.DataField(this, x => x.SpentDesc, "spentDesc", string.Empty);
serializer.DataField(this, x => x.IconStateLit, "iconStateOn", string.Empty);
serializer.DataField(this, x => x.IconStateSpent, "iconStateSpent", string.Empty);
serializer.DataField(this, x => x.LitSound, "litSound", string.Empty);
serializer.DataField(this, x => x.LoopedSound, "loopedSound", string.Empty);
serializer.DataField(this, x => x.DieSound, "dieSound", string.Empty);
}
}
}

7
Content.Shared/Interfaces/IConfigurable.cs
View File

@@ -1,7 +0,0 @@
namespace Content.Shared.Interfaces
{
public interface IConfigurable<in T>
{
public void Configure(T parameters);
}
}

9
Content.Shared/Interfaces/IConfigurableOverlay.cs Normal file
View File

@@ -0,0 +1,9 @@
using Content.Shared.GameObjects.Components.Mobs;
namespace Content.Shared.Interfaces
{
public interface IConfigurableOverlay
{
void Configure(OverlayParameter parameter);
}
}