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

Update stomach removal and lung removal smite to not use Component.Owner (#29927)

Browse Source 
* Update stomach removal and lung removal smite

* New function makes things simple

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-07-28 01:25:40 -07:00
committed by GitHub
parent ab84eee083
commit 79fa810b9c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,9 +361,9 @@ public sealed partial class AdminVerbSystem
Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"), Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"),
Act = () => Act = () =>
{ {
foreach (var (component, _) in _bodySystem.GetBodyOrganComponents<StomachComponent>(args.Target, body)) foreach (var entity in _bodySystem.GetBodyOrganEntityComps<StomachComponent>((args.Target, body)))
{ {
QueueDel(component.Owner); QueueDel(entity.Owner);
} }
_popupSystem.PopupEntity(Loc.GetString("admin-smite-stomach-removal-self"), args.Target, _popupSystem.PopupEntity(Loc.GetString("admin-smite-stomach-removal-self"), args.Target,
@@ -381,9 +381,9 @@ public sealed partial class AdminVerbSystem
Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"), Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"),
Act = () => Act = () =>
{ {
foreach (var (component, _) in _bodySystem.GetBodyOrganComponents<LungComponent>(args.Target, body)) foreach (var entity in _bodySystem.GetBodyOrganEntityComps<LungComponent>((args.Target, body)))
{ {
QueueDel(component.Owner); QueueDel(entity.Owner);
} }
_popupSystem.PopupEntity(Loc.GetString("admin-smite-lung-removal-self"), args.Target, _popupSystem.PopupEntity(Loc.GetString("admin-smite-lung-removal-self"), args.Target,