tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Refactor Damage to use Protoypes (#4262)"

Browse Source 
This reverts commit 20bf5739a9.
This commit is contained in:
Silver
2021-08-24 00:50:39 -06:00
committed by Silver
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
View File

@@ -16,24 +16,12 @@ namespace Content.Shared.MedicalScanner
public class MedicalScannerBoundUserInterfaceState : BoundUserInterfaceState
{
public readonly EntityUid? Entity;
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
public readonly Dictionary<DamageClass, int> DamageClasses;
public readonly Dictionary<DamageType, int> DamageTypes;
=======
public readonly Dictionary<string, int> DamagePerSupportedGroupID;
public readonly Dictionary<string, int> DamagePerTypeID;
>>>>>>> Refactor damageablecomponent update (#4406)
=======
public readonly Dictionary<string, int> DamagePerSupportedGroupID;
public readonly Dictionary<string, int> DamagePerTypeID;
>>>>>>> refactor-damageablecomponent
public readonly bool IsScanned;
public MedicalScannerBoundUserInterfaceState(
EntityUid? entity,
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
Dictionary<DamageClass, int> damageClasses,
Dictionary<DamageType, int> damageTypes,
bool isScanned)
@@ -41,38 +29,12 @@ namespace Content.Shared.MedicalScanner
Entity = entity;
DamageClasses = damageClasses;
DamageTypes = damageTypes;
=======
Dictionary<string, int> damagePerSupportedGroupID,
Dictionary<string, int> damagePerTypeID,
bool isScanned)
{
Entity = entity;
DamagePerSupportedGroupID = damagePerSupportedGroupID;
DamagePerTypeID = damagePerTypeID;
>>>>>>> Refactor damageablecomponent update (#4406)
=======
Dictionary<string, int> damagePerSupportedGroupID,
Dictionary<string, int> damagePerTypeID,
bool isScanned)
{
Entity = entity;
DamagePerSupportedGroupID = damagePerSupportedGroupID;
DamagePerTypeID = damagePerTypeID;
>>>>>>> refactor-damageablecomponent
IsScanned = isScanned;
}
public bool HasDamage()
{
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
return DamageClasses.Count > 0 || DamageTypes.Count > 0;
=======
return DamagePerSupportedGroupID.Count > 0 || DamagePerTypeID.Count > 0;
>>>>>>> Refactor damageablecomponent update (#4406)
=======
return DamagePerSupportedGroupID.Count > 0 || DamagePerTypeID.Count > 0;
>>>>>>> refactor-damageablecomponent
}
}