guh

Author: MilonPL

Content.Server/DeltaV/Ghost/Roles/Components/GhostRoleCharacterSpawnerComponent.cs

@@ -1,4 +1,7 @@
-namespace Content.Server.Ghost.Roles.Components
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Ghost.Roles.Components
 {
     /// <summary>
     ///     Allows a ghost to take this role, spawning their selected character.
@@ -17,18 +20,12 @@ public sealed partial class GhostRoleCharacterSpawnerComponent : Component
         public int CurrentTakeovers = 0;
 
         [DataField]
-        public string OutfitPrototype = "PassengerGear";
-
-        /// <summary>
-        ///  Whether to give the MindShield and AntagImmune components on spawn.
-        /// </summary>
-        [DataField]
-        public bool MindShield;
+        public ProtoId<StartingGearPrototype> OutfitPrototype = "PassengerGear";
 
         /// <summary>
-        /// Whether to give the TargetObjectiveImmune component on spawn.
+        ///  Components to give on spawn.
         /// </summary>
         [DataField]
-        public bool TargetObjectiveImmune;
+        public ComponentRegistry Components = new();
     }
 }

Content.Server/DeltaV/Ghost/Roles/GhostRoleSystem.Character.cs

@@ -1,14 +1,10 @@
 using Content.Server.Administration.Commands;
-using Content.Server.Antag.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Ghost.Roles.Events;
-using Content.Server.Objectives.Components;
 using Content.Server.Preferences.Managers;
 using Content.Server.Station.Systems;
 using Content.Shared.Mind.Components;
-using Content.Shared.Mindshield.Components;
 using Content.Shared.Preferences;
-using Content.Shared.Roles;
 
 namespace Content.Server.Ghost.Roles
 {
@@ -17,9 +13,12 @@ public sealed partial class GhostRoleSystem
         [Dependency] private readonly IServerPreferencesManager _prefs = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
-        private void OnSpawnerTakeCharacter( EntityUid uid, GhostRoleCharacterSpawnerComponent component,
+        private void OnSpawnerTakeCharacter(Entity<GhostRoleCharacterSpawnerComponent> ent,
             ref TakeGhostRoleEvent args)
         {
+            var uid = ent.Owner;
+            var component = ent.Comp;
+
             if (!TryComp(uid, out GhostRoleComponent? ghostRole) ||
                 ghostRole.Taken)
             {
@@ -33,28 +32,16 @@ private void OnSpawnerTakeCharacter( EntityUid uid, GhostRoleCharacterSpawnerCom
                 .SpawnPlayerMob(Transform(uid).Coordinates, null, character, null);
             _transform.AttachToGridOrMap(mob);
 
-            string? outfit = null;
-            if (_prototype.TryIndex<StartingGearPrototype>(component.OutfitPrototype, out var outfitProto))
-                outfit = outfitProto.ID;
-
             var spawnedEvent = new GhostRoleSpawnerUsedEvent(uid, mob);
             RaiseLocalEvent(mob, spawnedEvent);
 
             EnsureComp<MindContainerComponent>(mob);
 
             GhostRoleInternalCreateMindAndTransfer(args.Player, uid, mob, ghostRole);
 
-            if (outfit != null)
-                SetOutfitCommand.SetOutfit(mob, outfit, _entityManager);
-
-            if (component.MindShield)
-            {
-                EnsureComp<MindShieldComponent>(mob);
-                EnsureComp<AntagImmuneComponent>(mob);
-            }
+            SetOutfitCommand.SetOutfit(mob, component.OutfitPrototype, _entityManager);
 
-            if (component.TargetObjectiveImmune)
-                EnsureComp<TargetObjectiveImmuneComponent>(mob);
+            EntityManager.AddComponents(mob, component.Components);
 
             if (++component.CurrentTakeovers < component.AvailableTakeovers)
             {

Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml

@@ -24,7 +24,8 @@
   suffix: mindshielded, player character
   components:
   - type: GhostRoleCharacterSpawner
-    mindShield: true
+    components:
+    - MindShield
 
 - type: entity
   parent: SpawnPointPlayerCharacter
@@ -33,8 +34,10 @@
   suffix: mindshielded, KillObjectiveImmune, player character
   components:
   - type: GhostRoleCharacterSpawner
-    mindShield: true
-    targetObjectiveImmune: true
+    components:
+    - MindShield
+    - AntagImmune
+    - TargetObjectiveImmune
 
 - type: entity # Part of ListeningPost
   categories: [ HideSpawnMenu, Spawner ]