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

Refactoring body system to use containers and general body cleanup (#20202)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Jezithyr
2023-09-21 00:23:02 -07:00
committed by GitHub
parent d888d9ad67
commit 31b2c9f830
38 changed files with 1298 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
View File

@@ -76,6 +76,7 @@ public sealed partial class AdminVerbSystem
[Dependency] private readonly VomitSystem _vomitSystem = default!;
[Dependency] private readonly WeldableSystem _weldableSystem = default!;
[Dependency] private readonly SharedContentEyeSystem _eyeSystem = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
// All smite verbs have names so invokeverb works.
private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
@@ -293,8 +294,7 @@ public sealed partial class AdminVerbSystem
if (HasComp<BrainComponent>(xform.Owner) || HasComp<EyeComponent>(xform.Owner))
continue;
var coordinates = baseXform.Coordinates.Offset(_random.NextVector2(0.5f, 0.75f));
_bodySystem.DropOrganAt(organ.Owner, coordinates, organ);
_transformSystem.AttachToGridOrMap(organ.Owner);
}
_popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target,
@@ -317,7 +317,7 @@ public sealed partial class AdminVerbSystem
var baseXform = Transform(args.Target);
foreach (var part in _bodySystem.GetBodyChildrenOfType(args.Target, BodyPartType.Hand))
{
_bodySystem.DropPartAt(part.Id, baseXform.Coordinates, part.Component);
_transformSystem.AttachToGridOrMap(part.Id);
}
_popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
args.Target, PopupType.LargeCaution);
@@ -339,7 +339,7 @@ public sealed partial class AdminVerbSystem
var baseXform = Transform(args.Target);
foreach (var part in _bodySystem.GetBodyChildrenOfType(body.Owner, BodyPartType.Hand, body))
{
_bodySystem.DropPartAt(part.Id, baseXform.Coordinates, part.Component);
_transformSystem.AttachToGridOrMap(part.Id);
break;
}
_popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,