Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ling fixes and tweaks (#259)

Browse Source 
* - fix: Bees fix.

* - fix: Transform transfers body type.

* - fix: Chemcap is transfered on transform.

* - fix: Gulag objective actual fix.

* - fix: Fix escape with identity not working.

* - tweak: Fixes & objective tweaks.

* - tweak: More slowdown from ling armor.
This commit is contained in:
Aviu00
2024-04-01 20:36:32 +09:00
committed by GitHub
parent 9603c83adf
commit 2e57cbf514
19 changed files with 143 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Linq;
using Content.Server._Miracle.Components;
using Content.Server._Miracle.GulagSystem;
using Content.Server._White.Cult.GameRule;
using Content.Server.Objectives.Components;
using Content.Server.Shuttles.Systems;
@@ -23,6 +24,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
[Dependency] private readonly SharedJobSystem _job = default!;
[Dependency] private readonly SharedMindSystem _mind = default!;
[Dependency] private readonly TargetObjectiveSystem _target = default!;
[Dependency] private readonly GulagSystem _gulag = default!; // WD
public override void Initialize()
{
@@ -60,7 +62,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
// no other humans to kill
var allHumans = _mind.GetAliveHumansExcept(args.MindId);
allHumans = allHumans.Where(x => !HasComp<GulagBoundComponent>(x)).ToList(); // WD
allHumans = allHumans.Where(x => !_gulag.IsMindGulagged(x)).ToList();
if (allHumans.Count == 0)
{
args.Cancelled = true;
@@ -85,7 +87,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
// no other humans to kill
var allHumans = _mind.GetAliveHumansExcept(args.MindId);
allHumans = allHumans.Where(x => !HasComp<GulagBoundComponent>(x)).ToList(); // WD
allHumans = allHumans.Where(x => !_gulag.IsMindGulagged(x)).ToList();
if (allHumans.Count == 0)
{
args.Cancelled = true;