aftermerge icon fix + force acsension

Content.Client/SS220/CultYogg/ShowCultYoggIconSystem.cs

@@ -23,7 +23,7 @@ public override void Initialize()
         SubscribeLocalEvent<CultYoggSacrificialComponent, GetStatusIconsEvent>(OnGetSacraficialIconsEvent);
     }
 
-    private void OnGetCultistsIconsEvent(EntityUid uid, ShowCultYoggIconsComponent _, ref GetStatusIconsEvent ev)
+    private void OnGetCultistsIconsEvent(Entity<ShowCultYoggIconsComponent> uid, ref GetStatusIconsEvent ev)
     {
         var iconId = JobIconForNoId;
 
@@ -32,12 +32,12 @@ private void OnGetCultistsIconsEvent(EntityUid uid, ShowCultYoggIconsComponent _
             iconId = cultComp.StatusIcon;
         }
 
-        if (_prototype.TryIndex<StatusIconPrototype>(iconId, out var iconPrototype))
+        if (_prototype.TryIndex<FactionIconPrototype>(iconId, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
         else
             Log.Error($"Invalid job icon prototype: {iconPrototype}");
     }
-    private void OnGetSacraficialIconsEvent(EntityUid uid, CultYoggSacrificialComponent _, ref GetStatusIconsEvent ev)
+    private void OnGetSacraficialIconsEvent(Entity<CultYoggSacrificialComponent> uid, ref GetStatusIconsEvent ev)
     {
         var viewer = _playerManager.LocalSession?.AttachedEntity;
         if (viewer == uid)
@@ -50,7 +50,7 @@ private void OnGetSacraficialIconsEvent(EntityUid uid, CultYoggSacrificialCompon
             iconId = sacrComp.StatusIcon;
         }
 
-        if (_prototype.TryIndex<StatusIconPrototype>(iconId, out var iconPrototype))
+        if (_prototype.TryIndex<FactionIconPrototype>(iconId, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
         else
             Log.Error($"Invalid job icon prototype: {iconPrototype}");

Content.Server/SS220/CultYogg/CultYoggSystem.cs

@@ -7,7 +7,6 @@
 using Content.Shared.SS220.CultYogg.Components;
 using Content.Shared.SS220.CultYogg.EntitySystems;
 using Robust.Shared.Timing;
-using System;
 
 namespace Content.Server.SS220.CultYogg;
 
@@ -60,7 +59,7 @@ public override void Initialize()
     private bool AvaliableMiGoCheck()
     {
         //Check number of MiGo in gamerule
-        _cultRule.GetCultGameRuleComp(out var ruleComp);
+        _cultRule.GetCultGameRule(out var cultRuleEnt, out var ruleComp);
 
         if (ruleComp is null)
             return false;

Content.Server/SS220/CultYogg/Nyarlathotep/NyarlathotepTargetSearcherSystem.cs

@@ -36,9 +36,9 @@ private void OnCompInit(Entity<NyarlathotepSearchTargetsComponent> uid, ref Comp
     {
         var selectedSong = _audio.GetSound(uid.Comp.SummonMusic);
         if (!string.IsNullOrEmpty(selectedSong))
-            _sound.DispatchStationEventMusic(uid, selectedSong, StationEventMusicType.Nuke);
+            _sound.DispatchStationEventMusic(uid, selectedSong, StationEventMusicType.Nuke);//ToDo should i rename?
 
-        var ev = new CultYoggSummonedEvent();
+        var ev = new CultYoggSummonedEvent(uid);
         RaiseLocalEvent(uid, ref ev, true);
     }
 
@@ -96,8 +96,15 @@ private void TargetSearch(EntityUid uid, NyarlathotepSearchTargetsComponent comp
 ///     Raised when god summoned to markup winning
 /// </summary>
 [ByRefEvent, Serializable]
-public record struct CultYoggSummonedEvent;
+public sealed class CultYoggSummonedEvent : EntityEventArgs
+{
+    public readonly EntityUid Entity;
 
+    public CultYoggSummonedEvent(EntityUid entity)
+    {
+        Entity = entity;
+    }
+}
 /// <summary>
 /// Component for entities to be attacked by Nyarlathotep.
 /// </summary>

Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs

@@ -44,6 +44,8 @@
 using static System.Net.Mime.MediaTypeNames;
 using System.Xml.Linq;
 using Content.Server.SS220.CultYogg.Nyarlathotep.Components;
+using static Content.Shared.SS220.CultYogg.EntitySystems.SharedCultYoggSystem;
+using Content.Shared.PDA;
 
 namespace Content.Server.SS220.GameTicking.Rules;
 
@@ -228,7 +230,7 @@ private List<EntityUid> GetAliveHumans()//maybe add here sacraficials and cultis
 
     private void SacraficialReplacement(ref SacraficialReplacementEvent args)
     {
-        GetCultGameRuleComp(out var cultRuleComp);
+        GetCultGameRule(out var cultRuleEnt, out var cultRuleComp);
 
         if (cultRuleComp == null)
             return;
@@ -274,14 +276,12 @@ private void MiGoEnslave(ref CultYoggEnslavedEvent args)
         if (args.Target == null)
             return;
 
-        GetCultGameRuleComp(out var cultRuleComp);
+        GetCultGameRule(out var cultRuleEnt, out var cultRuleComp);
 
         if (cultRuleComp == null)
             return;
 
         MakeCultist(args.Target.Value, cultRuleComp, false);
-
-        //args.Handled = true;
     }
     #endregion
 
@@ -326,13 +326,29 @@ public bool MakeCultist(EntityUid uid, CultYoggRuleComponent component, bool ini
     #endregion
 
     #region RoundEnding
-    private void OnGodSummoned(ref CultYoggSummonedEvent ev)
+    private void OnGodSummoned(ref CultYoggSummonedEvent args)
     {
         foreach (var station in _station.GetStations())
         {
             _chat.DispatchStationAnnouncement(station, Loc.GetString("cult-yogg-shuttle-call"), colorOverride: Color.Crimson);
         }
         _roundEnd.RequestRoundEnd(DefaultShuttleArriving, null);
+
+        GetCultGameRule(out var cultRuleEnt, out var cultRuleComp);
+
+        if (cultRuleEnt == null || cultRuleComp == null)
+            return;
+
+        cultRuleComp.Summoned = true;//Win EndText
+
+        var ev = new CultYoggForceAscendingEvent();
+
+        //Event hadn't raised on Cultists even with broadcast, so i made this
+        var query = EntityQueryEnumerator<CultYoggComponent>();
+        while (query.MoveNext(out var ent, out var comp))
+        {
+            RaiseLocalEvent(ent, ref ev);//Make all cultists MiGo
+        }
     }
 
     #endregion
@@ -405,13 +421,15 @@ private float GetCultistsFraction()
     }
     #endregion
 
-    public void GetCultGameRuleComp(out CultYoggRuleComponent? comp)
+    public void GetCultGameRule(out EntityUid? ent, out CultYoggRuleComponent? comp)
     {
         comp = null;
+        ent = null;
         var query = QueryActiveRules();
         while (query.MoveNext(out var uid, out _, out var cultComp, out _))
         {
             comp = cultComp;
+            ent = uid;
         }
     }
 }

Content.Server/SS220/Objectives/CultYoggSummonConditionSystem.cs

@@ -30,7 +30,7 @@ public override void Initialize()
     //check if gamerule was rewritten
     private void OnInit(Entity<CultYoggSummonConditionComponent> ent, ref ComponentInit args)
     {
-        _cultRule.GetCultGameRuleComp(out var ruleComp);
+        _cultRule.GetCultGameRule(out var cultRuleEnt, out var ruleComp);
 
         if (ruleComp is null)
             return;
@@ -60,7 +60,7 @@ private void OnAfterAssign(Entity<CultYoggSummonConditionComponent> ent, ref Obj
     }
     private void OnGetProgress(Entity<CultYoggSummonConditionComponent> ent, ref ObjectiveGetProgressEvent args)
     {
-        _cultRule.GetCultGameRuleComp(out var ruleComp);
+        _cultRule.GetCultGameRule(out var cultRuleEnt, out var ruleComp);
 
         if (ruleComp is null)
             return;

Content.Server/SS220/Objectives/MiGoAliveConditionSystem.cs

@@ -25,7 +25,7 @@ public override void Initialize()
     //check if gamerule was rewritten
     private void OnInit(Entity<MiGoAliveConditionComponent> ent, ref ComponentInit args)
     {
-        _cultRule.GetCultGameRuleComp(out var ruleComp);
+        _cultRule.GetCultGameRule(out var cultRuleEnt, out var ruleComp);
 
         if (ruleComp is null)
             return;

Content.Shared/SS220/CultYogg/Components/CultYoggSacrificialComponent.cs

@@ -18,7 +18,7 @@ public sealed partial class CultYoggSacrificialComponent : Component
     public bool IconVisibleToGhost { get; set; } = true;
 
     [DataField]
-    public ProtoId<StatusIconPrototype> StatusIcon = "CultYoggSacraficialTarget";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "CultYoggSacraficialTarget";
 
     public int Tier = 0;//initilize as max possible tier
 

Content.Shared/SS220/CultYogg/Components/ShowCultYoggIconsComponent.cs

@@ -20,5 +20,5 @@ public sealed partial class ShowCultYoggIconsComponent : Component
     /// Cultists icon
     /// </summary>
     [DataField]
-    public ProtoId<StatusIconPrototype> StatusIcon = "CultYoggFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon = "CultYoggFaction";
 }

Content.Shared/SS220/CultYogg/EntitySystems/SharedCultYoggSystem.cs

@@ -50,6 +50,8 @@ public override void Initialize()
         SubscribeLocalEvent<CultYoggComponent, CultYoggCorruptItemEvent>(CorruptItemAction);
         SubscribeLocalEvent<CultYoggComponent, CultYoggCorruptItemInHandEvent>(CorruptItemInHandAction);
         SubscribeLocalEvent<CultYoggComponent, CultYoggAscendingEvent>(AscendingAction);
+
+        SubscribeLocalEvent<CultYoggComponent, CultYoggForceAscendingEvent>(ForcedAcending);
     }
 
     protected virtual void OnCompInit(Entity<CultYoggComponent> uid, ref ComponentStartup args)
@@ -66,6 +68,7 @@ protected virtual void OnCompInit(Entity<CultYoggComponent> uid, ref ComponentSt
         }
     }
 
+    #region Stage
     private void UpdateStage(EntityUid uid, CultYoggComponent component)
     {
         //rework stage's update for cultist's
@@ -143,7 +146,7 @@ private void OnExamined(EntityUid uid, CultYoggComponent component, ExaminedEven
 
         args.PushMarkup($"[color=green]{Loc.GetString("Глаза горят неестественно зелёным пламенем", ("ent", uid))}[/color]"); // no locale for right now
     }
-
+    #endregion
     #region Puke
     private void PukeAction(Entity<CultYoggComponent> uid, ref CultYoggPukeShroomEvent args)
     {
@@ -261,5 +264,26 @@ private void AscendingAction(Entity<CultYoggComponent> uid, ref CultYoggAscendin
         if (TryComp<BodyComponent>(uid, out var body))
             _body.GibBody(uid, body: body);
     }
+    private void ForcedAcending(Entity<CultYoggComponent> uid, ref CultYoggForceAscendingEvent args)
+    {
+        if (_net.IsClient)
+            return;
+
+        if (TerminatingOrDeleted(uid))
+            return;
+
+        // Get original body position and spawn MiGo here
+        var migo = _entityManager.SpawnAtPosition(uid.Comp.AscendedEntity, Transform(uid).Coordinates);
+
+        // Move the mind if there is one and it's supposed to be transferred
+        if (_mind.TryGetMind(uid, out var mindId, out var mind))
+            _mind.TransferTo(mindId, migo, mind: mind);
+
+        //Gib original body
+        if (TryComp<BodyComponent>(uid, out var body))
+            _body.GibBody(uid, body: body);
+    }
+    [ByRefEvent, Serializable]
+    public record struct CultYoggForceAscendingEvent;
     #endregion
 }

Resources/Prototypes/SS220/StatusIcon/antag.yml

@@ -1,6 +1,6 @@
 # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
-- type: statusIcon
+- type: factionIcon
   id: CultYoggFaction
   priority: 11
   showTo:
@@ -12,7 +12,7 @@
     sprite: /Textures/SS220/Interface/Misc/cult_yogg_icons.rsi
     state: cult_yogg
 
-- type: statusIcon
+- type: factionIcon
   id: CultYoggSacraficialTarget
   priority: 3
   showTo: