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

Renames phoron to plasma everywhere in the codebase and replaces sprites. (#3110)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-02-09 19:05:19 +01:00
committed by GitHub
parent 2d06990ee3
commit 9b1142973e
75 changed files with 154 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
View File

@@ -225,7 +225,7 @@ namespace Content.Server.GameObjects.Components.Atmos
case "chem.WeldingFuel":
case "chem.Thermite":
case "chem.Phoron":
case "chem.Plasma":
case "chem.Ethanol":
AdjustFireStacks(volume.Float() / 10f);
return volume;

2
Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
View File

@@ -96,7 +96,7 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping.Filters
base.ExposeData(serializer);
serializer.DataField(ref _volumeFilterRate, "startingVolumePumpRate", 0);
serializer.DataField(ref _maxVolumeFilterRate, "maxVolumePumpRate", 100);
serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Phoron);
serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Plasma);
serializer.DataField(ref _initialInletDirection, "inletDirection", PipeDirection.None);
serializer.DataField(ref _initialFilterOutletDirection, "filterOutletDirection", PipeDirection.None);
serializer.DataField(ref _initialOutletDirection, "outletDirection", PipeDirection.None);

4
Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
View File

@@ -104,8 +104,8 @@ namespace Content.Server.GameObjects.Components.Power
void ISolutionChange.SolutionChanged(SolutionChangeEventArgs eventArgs)
{
IsRigged = Owner.TryGetComponent(out SolutionContainerComponent? solution)
&& solution.Solution.ContainsReagent("chem.Phoron", out var phoron)
&& phoron >= 5;
&& solution.Solution.ContainsReagent("chem.Plasma", out var plasma)
&& plasma >= 5;
}
}