diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs index 45d4a23e0d2..94f562007ad 100644 --- a/Content.Server/Botany/Systems/MutationSystem.cs +++ b/Content.Server/Botany/Systems/MutationSystem.cs @@ -66,7 +66,7 @@ public void MutateSeed(ref SeedData seed, float severity) // Fun (90) MutateBool(ref seed.Seedless , true , 10, totalbits, severity); MutateBool(ref seed.Slip , true , 10, totalbits, severity); - //MutateBool(ref seed.Sentient , true , 10, totalbits, severity); + MutateBool(ref seed.Sentient , true , 10, totalbits, severity); MutateBool(ref seed.Ligneous , true , 10, totalbits, severity); //MutateBool(ref seed.Bioluminescent, true , 10, totalbits, severity); MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity); diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 377cb58368a..a1b0691d5c8 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -24,6 +24,7 @@ using Content.Server.UserInterface; using Content.Shared.StationRecords; using Content.Server.Chat.Systems; +using Content.Server.Mind; using Content.Server.StationRecords.Systems; using Content.Shared.Database; using Content.Server.Station.Components; @@ -45,6 +46,7 @@ public sealed partial class ShipyardSystem : SharedShipyardSystem [Dependency] private readonly StationRecordsSystem _records = default!; [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly MindSystem _mind = default!; public void InitializeConsole() { @@ -375,8 +377,12 @@ public bool FoundOrganics(EntityUid uid, EntityQuery mobQuery while (childEnumerator.MoveNext(out var child)) { - if (mobQuery.TryGetComponent(child.Value, out var mobState) && !_mobState.IsDead(child.Value, mobState) - || FoundOrganics(child.Value, mobQuery, xformQuery)) return true; + if (mobQuery.TryGetComponent(child.Value, out var mobState) + && !_mobState.IsDead(child.Value, mobState) + && _mind.TryGetMind(child.Value, out var mind, out var mindComp) + && !_mind.IsCharacterDeadIc(mindComp) + || FoundOrganics(child.Value, mobQuery, xformQuery)) + return true; } return false; diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 6dfcf575e37..40d458fed0a 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -207,17 +207,17 @@ # maxDuration: 120 # - type: PowerGridCheckRule -# - type: entity - # id: RandomSentience - # parent: BaseGameRule - # noSpawn: true - # components: - # - type: StationEvent - # weight: 10 - # duration: 1 - # startAudio: - # path: /Audio/Announcements/attention.ogg - # - type: RandomSentienceRule +- type: entity + id: RandomSentience + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + weight: 10 + duration: 1 + startAudio: + path: /Audio/Announcements/attention.ogg + - type: RandomSentienceRule - type: entity parent: BaseGameRule