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

Merge branch 'master' into 2020-08-31-click-attack

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-01 03:25:14 +02:00
parent 391444c879 fdd61d1c94
commit db12634bd5
25 changed files with 325 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Damage/DamageClass.cs
View File

@@ -12,7 +12,8 @@ namespace Content.Shared.Damage
Brute,
Burn,
Toxin,
Airloss
Airloss,
Genetic
}
public static class DamageClassExtensions
@@ -20,10 +21,11 @@ namespace Content.Shared.Damage
private static readonly ImmutableDictionary<DamageClass, List<DamageType>> ClassToType =
new Dictionary<DamageClass, List<DamageType>>
{
{DamageClass.Brute, new List<DamageType> {DamageType.Blunt, DamageType.Piercing}},
{DamageClass.Burn, new List<DamageType> {DamageType.Heat, DamageType.Disintegration}},
{DamageClass.Toxin, new List<DamageType> {DamageType.Cellular, DamageType.DNA}},
{DamageClass.Airloss, new List<DamageType> {DamageType.Asphyxiation}}
{DamageClass.Brute, new List<DamageType> {DamageType.Blunt, DamageType.Slash, DamageType.Piercing}},
{DamageClass.Burn, new List<DamageType> {DamageType.Heat, DamageType.Shock, DamageType.Cold}},
{DamageClass.Toxin, new List<DamageType> {DamageType.Poison, DamageType.Radiation}},
{DamageClass.Airloss, new List<DamageType> {DamageType.Asphyxiation, DamageType.Bloodloss}},
{DamageClass.Genetic, new List<DamageType> {DamageType.Cellular}}
}.ToImmutableDictionary();
public static List<DamageType> ToTypes(this DamageClass @class)

25
Content.Shared/Damage/DamageType.cs
View File

@@ -10,12 +10,16 @@ namespace Content.Shared.Damage
public enum DamageType
{
Blunt,
Slash,
Piercing,
Heat,
Disintegration,
Cellular,
DNA,
Asphyxiation
Shock,
Cold,
Poison,
Radiation,
Asphyxiation,
Bloodloss,
Cellular
}
public static class DamageTypeExtensions
@@ -25,12 +29,17 @@ namespace Content.Shared.Damage
new Dictionary<DamageType, DamageClass>
{
{DamageType.Blunt, DamageClass.Brute},
{DamageType.Slash, DamageClass.Brute},
{DamageType.Piercing, DamageClass.Brute},
{DamageType.Heat, DamageClass.Burn},
{DamageType.Disintegration, DamageClass.Burn},
{DamageType.Cellular, DamageClass.Toxin},
{DamageType.DNA, DamageClass.Toxin},
{DamageType.Asphyxiation, DamageClass.Airloss}
{DamageType.Shock, DamageClass.Burn},
{DamageType.Cold, DamageClass.Burn},
{DamageType.Poison, DamageClass.Toxin},
{DamageType.Radiation, DamageClass.Toxin},
{DamageType.Asphyxiation, DamageClass.Airloss},
{DamageType.Bloodloss, DamageClass.Airloss},
{DamageType.Cellular, DamageClass.Genetic }
}.ToImmutableDictionary();
public static DamageClass ToClass(this DamageType type)

31
Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs Normal file
View File

@@ -0,0 +1,31 @@
using Content.Shared.GameObjects.Components.Atmos;
using Robust.Shared.Serialization;
using System;
namespace Content.Shared.GameObjects.Atmos
{
[Serializable, NetSerializable]
public enum PumpVisuals
{
VisualState
}
[Serializable, NetSerializable]
public class PumpVisualState
{
public readonly PipeDirection InletDirection;
public readonly PipeDirection OutletDirection;
public readonly ConduitLayer InletConduitLayer;
public readonly ConduitLayer OutletConduitLayer;
public readonly bool PumpEnabled;
public PumpVisualState(PipeDirection inletDirection, PipeDirection outletDirection, ConduitLayer inletConduitLayer, ConduitLayer outletConduitLayer, bool pumpEnabled)
{
InletDirection = inletDirection;
OutletDirection = outletDirection;
InletConduitLayer = inletConduitLayer;
OutletConduitLayer = outletConduitLayer;
PumpEnabled = pumpEnabled;
}
}
}