Supermatter copyright violation fix

Content.Server/Radio/EntitySystems/RadioSystem.cs

@@ -199,7 +199,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
     private string GetIdCardName(EntityUid senderUid)
     {
         var idCardTitle = Loc.GetString("chat-radio-no-id");
-        idCardTitle = GetIdCard(senderUid)?.LocalizedJobTitle ?? idCardTitle;
+        idCardTitle = GetIdCard(senderUid)?.JobTitle ?? idCardTitle;
 
         var textInfo = CultureInfo.CurrentCulture.TextInfo;
         idCardTitle = textInfo.ToTitleCase(idCardTitle);

Content.Server/Singularity/EntitySystems/SingularitySystem.cs

@@ -4,10 +4,11 @@
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
 using Content.Shared.Singularity.Events;
-using Content.Server.Supermatter.Components;
 using Robust.Server.GameStates;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Singularity.EntitySystems;
@@ -36,11 +37,6 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// </summary>
     public const float BaseEntityEnergy = 1f;
 
-    /// <summary>
-    ///     Whether or not the singuloo has eaten the supermatter crystal
-    /// </summary>
-    public bool HasEatenSM = false;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -107,7 +103,7 @@ public void SetEnergy(EntityUid uid, float value, SingularityComponent? singular
         {
 			// Normally, a level 6 singularity requires the supermatter + 3000 energy.
 			// The required amount of energy has been bumped up to compensate for the lack of the supermatter.
-            >= 5000 when HasEatenSM => 6,
+            >= 5000 => 6,
             >= 2000 => 5,
             >= 1000 => 4,
             >= 500 => 3,
@@ -220,8 +216,7 @@ public void OnConsumedEntity(EntityUid uid, SingularityComponent comp, ref Entit
         // Don't double count singulo food
         if (HasComp<SinguloFoodComponent>(args.Entity))
             return;
-        if (HasComp<SupermatterComponent>(uid))
-            HasEatenSM = true;
+
         AdjustEnergy(uid, BaseEntityEnergy, singularity: comp);
     }