Fix other old refactor conflicts

Simple-Station · Nov 6, 2023 · 4577f38 · 4577f38
1 parent 279bda9
commit 4577f38
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/Content.Server/SimpleStation14/Chat/ESayCommand.cs b/Content.Server/SimpleStation14/Chat/ESayCommand.cs
@@ -37,7 +37,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             if (string.IsNullOrEmpty(message))
                 return;
 
-            EntitySystem.Get<ChatSystem>().TrySendInGameICMessage(playerEntity, message, InGameICChatType.Empathy, false, shell, player, checkRadioPrefix: false);
+            EntitySystem.Get<ChatSystem>().TrySendInGameICMessage(playerEntity, message, InGameICChatType.Empathy, false, false, shell, player, checkRadioPrefix: false);
         }
     }
 }
diff --git a/Content.Server/SimpleStation14/Species/Shadowkin/Events/ShadowkinEvents.Powers.cs b/Content.Server/SimpleStation14/Species/Shadowkin/Events/ShadowkinEvents.Powers.cs
@@ -24,7 +24,7 @@ public sealed partial class ShadowkinTeleportEvent : WorldTargetActionEvent, ISp
 
 
     [DataField("speech")]
-    public string? Speech { get; }
+    public string? Speech { get; set; }
 }
 
 /// <summary>

diff --git a/Content.Server/SimpleStation14/Species/Shadowkin/Systems/ShadowkinPowerSystem.Darken.cs b/Content.Server/SimpleStation14/Species/Shadowkin/Systems/ShadowkinPowerSystem.Darken.cs
@@ -24,7 +24,7 @@ public void ResetLight(PointLightComponent light, ShadowkinLightComponent sLight
         sLight.OldRadiusEdited = false;
 
         if (sLight.OldEnergyEdited)
-            light.Energy = sLight.OldEnergy;
+            _light.SetEnergy(light.Owner, sLight.OldEnergy);
         sLight.OldEnergyEdited = false;
     }
 
@@ -136,7 +136,7 @@ public override void Update(float frameTime)
 
                 // Put changes into effect
                 _light.SetRadius(pointLight.Owner, radius);
-                pointLight.Energy = energy;
+                _light.SetEnergy(pointLight.Owner, energy);
             }
         }
     }

diff --git a/Content.Server/SimpleStation14/Species/Shadowkin/Systems/ShadowkinSystem.Blackeye.cs b/Content.Server/SimpleStation14/Species/Shadowkin/Systems/ShadowkinSystem.Blackeye.cs
@@ -80,15 +80,9 @@ private void OnBlackeye(ShadowkinBlackeyeEvent ev)
 
         var minus = damageable.TotalDamage;
 
-        _damageable.TryChangeDamage(
-            ev.Uid,
-            new DamageSpecifier(_prototype.Index<DamageTypePrototype>("Cellular"),
+        _damageable.TryChangeDamage(ev.Uid, new DamageSpecifier(_prototype.Index<DamageTypePrototype>("Cellular"),
                 Math.Max((double) (key.Value - minus - 5), 0)),
-            true,
-            true,
-            null,
-            null,
-            false
-        );
+                true,
+                true, null, null);
     }
 }
diff --git a/Content.Server/SimpleStation14/Speech/Components/ShadowkinAccentComponent.cs b/Content.Server/SimpleStation14/Speech/Components/ShadowkinAccentComponent.cs
@@ -1,4 +1,4 @@
 namespace Content.Server.Speech.Components;
 
 [RegisterComponent]
-public sealed class ShadowkinAccentComponent : Component {}
+public sealed partial class ShadowkinAccentComponent : Component {}