tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow GhostTakeoverAvailable to use MakeSentient (#5616)

Browse Source
This commit is contained in:
metalgearsloth
2021-12-03 20:31:14 +11:00
committed by GitHub
parent 3f8f4c818e
commit c17ef0b3c8
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
View File

@@ -22,9 +22,6 @@ namespace Content.Server.Ghost.Roles.Components
[ViewVariables(VVAccess.ReadWrite)] [DataField("deleteOnSpawn")]
private bool _deleteOnSpawn = true;
[ViewVariables(VVAccess.ReadWrite)] [DataField("makeSentient")]
private bool _makeSentient = true;
[ViewVariables(VVAccess.ReadWrite)] [DataField("availableTakeovers")]
private int _availableTakeovers = 1;
@@ -41,12 +38,12 @@ namespace Content.Server.Ghost.Roles.Components
if (Taken)
return false;
if(string.IsNullOrEmpty(Prototype))
if (string.IsNullOrEmpty(Prototype))
throw new NullReferenceException("Prototype string cannot be null or empty!");
var mob = Owner.EntityManager.SpawnEntity(Prototype, Owner.Transform.Coordinates);
if(_makeSentient)
if (MakeSentient)
MakeSentientCommand.MakeSentient(mob.Uid, Owner.EntityManager);
mob.EnsureComponent<MindComponent>();
@@ -62,9 +59,7 @@ namespace Content.Server.Ghost.Roles.Components
if (_deleteOnSpawn)
Owner.Delete();
return true;
}
}
}