Merge pull request #6152 from unitystation/Health-ReworkRebase

Health rework
unitystation · Mar 7, 2021 · e1f1176 · e1f1176
2 parents c50f069 + b231323
commit e1f1176
Show file tree

Hide file tree

Showing 815 changed files with 51,969 additions and 12,432 deletions.
diff --git a/UnityProject/Assets/IngameDebugConsole/Scripts/DebugLogUnitystationCommands.cs b/UnityProject/Assets/IngameDebugConsole/Scripts/DebugLogUnitystationCommands.cs
@@ -272,7 +272,7 @@ private static void KillLocalPlayer()
 		{
 			if (CustomNetworkManager.Instance._isServer)
 			{
-				PlayerManager.LocalPlayerScript.playerHealth.ApplyDamage(null, 99999f, AttackType.Internal, DamageType.Brute);
+				PlayerManager.LocalPlayerScript.playerHealth.ApplyDamageToRandom(null, 99999f, AttackType.Internal, DamageType.Brute);
 			}
 		}
 #if UNITY_EDITOR
@@ -308,7 +308,7 @@ private static void CrashIntoStation()
 
 				foreach ( var movableMatrix in matrices )
 				{
-					if ( movableMatrix == null || movableMatrix.GameObject.name.ToLower().Contains( "verylarge" ) )
+					if ( movableMatrix.GameObject.name.ToLower().Contains( "verylarge" ) )
 					{
 						continue;
 					}
@@ -426,11 +426,7 @@ private static void HealUp()
 			{
 				var playerScript = PlayerManager.LocalPlayerScript;
 				var health = playerScript.playerHealth;
-				foreach (var bodyPart in health.BodyParts)
-				{
-					bodyPart.HealDamage(200, DamageType.Brute);
-					bodyPart.HealDamage(200, DamageType.Burn);
-				}
+				health.ResetDamageAll();
 				playerScript.registerTile.ServerStandUp();
 			}
 		}

diff --git a/UnityProject/Assets/Materials/PostProcess/Post-FloorFovGenerator Material.mat b/UnityProject/Assets/Materials/PostProcess/Post-FloorFovGenerator Material.mat
diff --git a/UnityProject/Assets/Materials/PostProcess/Post-FovGenerator.mat b/UnityProject/Assets/Materials/PostProcess/Post-FovGenerator.mat
diff --git a/UnityProject/Assets/Materials/Resources/OverlayCritHole.mat b/UnityProject/Assets/Materials/Resources/OverlayCritHole.mat
diff --git a/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs.meta b/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs.meta
diff --git a/UnityProject/Assets/Plugins/SerializableDictionary/SerializableDictionary.cs b/UnityProject/Assets/Plugins/SerializableDictionary/SerializableDictionary.cs
@@ -95,8 +95,18 @@ public void OnBeforeSerialize()
 
 	public TValue this[TKey key]
 	{
-		get { return ((IDictionary<TKey, TValue>)m_dict)[key]; }
-		set { ((IDictionary<TKey, TValue>)m_dict)[key] = value; }
+		get
+		{
+			return ((IDictionary<TKey, TValue>)m_dict)[key];
+		}
+		set
+		{
+			if (key == null)
+			{
+				return;
+			}
+			((IDictionary<TKey, TValue>)m_dict)[key] = value;
+		}
 	}
 
 	public void Add(TKey key, TValue value)

diff --git a/UnityProject/Assets/Resources/Prefabs/Items/Chemistry/Syringes/Syringe.prefab b/UnityProject/Assets/Resources/Prefabs/Items/Chemistry/Syringes/Syringe.prefab