the return of player character spawners (feat. mindshield bullshit) (#…

…2072) * aaaaaaaaaaa * guh * epic fail * fuck it we ball
DeltaV-Station · Nov 6, 2024 · 1e0c4f3 · 1e0c4f3
1 parent c10de70
commit 1e0c4f3
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 18 deletions.
diff --git a/Content.Server/DeltaV/Ghost/Roles/Components/GhostRoleCharacterSpawnerComponent.cs b/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.
@@ -7,16 +10,22 @@
     [Access(typeof(GhostRoleSystem))]
     public sealed partial class GhostRoleCharacterSpawnerComponent : Component
     {
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("deleteOnSpawn")]
+        [DataField]
         public bool DeleteOnSpawn = true;
 
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("availableTakeovers")]
+        [DataField]
         public int AvailableTakeovers = 1;
 
         [ViewVariables]
         public int CurrentTakeovers = 0;
 
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("outfitPrototype")]
-        public string OutfitPrototype = "PassengerGear";
+        [DataField]
+        public ProtoId<StartingGearPrototype> OutfitPrototype = "PassengerGear";
+
+        /// <summary>
+        ///  Components to give on spawn.
+        /// </summary>
+        [DataField]
+        public ComponentRegistry AddedComponents = new();
     }
 }
diff --git a/Content.Server/DeltaV/Ghost/Roles/GhostRoleSystem.Character.cs b/Content.Server/DeltaV/Ghost/Roles/GhostRoleSystem.Character.cs
@@ -5,8 +5,6 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Mind.Components;
 using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Ghost.Roles
 {
@@ -15,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)
             {
@@ -31,19 +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);
+            SetOutfitCommand.SetOutfit(mob, component.OutfitPrototype, _entityManager);
+
+            EntityManager.AddComponents(mob, component.AddedComponents);
 
             if (++component.CurrentTakeovers < component.AvailableTakeovers)
             {

diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
@@ -1,14 +1,14 @@
 - type: entity
-  categories: [ HideSpawnMenu, Spawner ]
+  categories: [ Spawner ]
   parent: MarkerBase
   id: SpawnPointPlayerCharacter
   name: ghost role spawn point
-  suffix: player character, DO NOT MAP
+  suffix: player character
   components:
     - type: GhostRole
       name: Roleplay Ghost Role
-      description: Placeholder
-      rules: Placeholder
+      description: This is a custom event ghost role.
+      rules: ghost-role-component-default-rules
     - type: GhostRoleCharacterSpawner
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -17,6 +17,28 @@
         - sprite: Mobs/Species/Human/parts.rsi
           state: full
 
+- type: entity
+  parent: SpawnPointPlayerCharacter
+  id: SpawnPointPlayerCharacterMindShield
+  name: ghost role spawn point
+  suffix: mindshielded, player character
+  components:
+  - type: GhostRoleCharacterSpawner
+    addedComponents:
+    - type: MindShield
+
+- type: entity
+  parent: SpawnPointPlayerCharacter
+  id: SpawnPointPlayerCharacterTargetImmune
+  name: ghost role spawn point
+  suffix: mindshielded, KillObjectiveImmune, player character
+  components:
+  - type: GhostRoleCharacterSpawner
+    addedComponents:
+    - type: MindShield
+    - type: AntagImmune
+    - type: TargetObjectiveImmune
+
 - type: entity # Part of ListeningPost
   categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner