From e2c61d625936260b3e7dfb2ff53d18a73f0530fd Mon Sep 17 00:00:00 2001 From: Jesse-sama <42539014+MiraHell@users.noreply.github.com> Date: Sun, 2 Jun 2024 21:12:20 +0300 Subject: [PATCH 1/6] dragon bodies fix --- Content.Server/Devour/DevourSystem.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs index febbd093a6cd..11d05d70aa2b 100644 --- a/Content.Server/Devour/DevourSystem.cs +++ b/Content.Server/Devour/DevourSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Devour; using Content.Shared.Devour.Components; using Content.Shared.Humanoid; +using Content.Server.Body.Components; namespace Content.Server.Devour; @@ -13,8 +14,9 @@ public sealed class DevourSystem : SharedDevourSystem public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnGibbed); + } private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args) @@ -45,5 +47,13 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter _audioSystem.PlayPvs(component.SoundDevour, uid); } + private void OnGibbed(EntityUid uid, DevourerComponent component, BeingGibbedEvent args) + { + + if (component.ShouldStoreDevoured) + { + ContainerSystem.EmptyContainer(component.Stomach); + } + } } From bb07f296ad1097d03cd7426ec95c3f1ec86017ad Mon Sep 17 00:00:00 2001 From: Jesse-sama <42539014+MiraHell@users.noreply.github.com> Date: Sun, 2 Jun 2024 21:16:54 +0300 Subject: [PATCH 2/6] 220 fix --- Content.Server/Devour/DevourSystem.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs index 11d05d70aa2b..edbcb01d182e 100644 --- a/Content.Server/Devour/DevourSystem.cs +++ b/Content.Server/Devour/DevourSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Devour; using Content.Shared.Devour.Components; using Content.Shared.Humanoid; -using Content.Server.Body.Components; +using Content.Server.Body.Components; // 220 Dragon Bodies Fix namespace Content.Server.Devour; @@ -15,7 +15,7 @@ public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnDoAfter); - SubscribeLocalEvent(OnGibbed); + SubscribeLocalEvent(OnGibbed); // 220 Dragon Bodies Fix } @@ -47,13 +47,15 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter _audioSystem.PlayPvs(component.SoundDevour, uid); } + + // Start 220 Dragon Bodies Fix private void OnGibbed(EntityUid uid, DevourerComponent component, BeingGibbedEvent args) { - if (component.ShouldStoreDevoured) { ContainerSystem.EmptyContainer(component.Stomach); } } + // End 220 Dragon Bodies Fix } From 5d966cff9c5d21b9b862b9920eeb7abc2566dd89 Mon Sep 17 00:00:00 2001 From: Jesse-sama <42539014+MiraHell@users.noreply.github.com> Date: Sun, 2 Jun 2024 21:20:05 +0300 Subject: [PATCH 3/6] minor --- Content.Server/Devour/DevourSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs index edbcb01d182e..b9b9e02a0d3a 100644 --- a/Content.Server/Devour/DevourSystem.cs +++ b/Content.Server/Devour/DevourSystem.cs @@ -14,9 +14,9 @@ public sealed class DevourSystem : SharedDevourSystem public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnDoAfter); SubscribeLocalEvent(OnGibbed); // 220 Dragon Bodies Fix - } private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args) From 8c7aac2a9aed578903def3ef79f09870e25f8083 Mon Sep 17 00:00:00 2001 From: Jesse-sama <42539014+MiraHell@users.noreply.github.com> Date: Sun, 2 Jun 2024 22:43:26 +0300 Subject: [PATCH 4/6] some fixes --- Content.Server/Devour/DevourSystem.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs index b9b9e02a0d3a..c7aadf9645e2 100644 --- a/Content.Server/Devour/DevourSystem.cs +++ b/Content.Server/Devour/DevourSystem.cs @@ -3,20 +3,22 @@ using Content.Shared.Devour; using Content.Shared.Devour.Components; using Content.Shared.Humanoid; -using Content.Server.Body.Components; // 220 Dragon Bodies Fix +using Content.Server.Body.Components; +using Robust.Server.Containers; namespace Content.Server.Devour; public sealed class DevourSystem : SharedDevourSystem { [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; + [Dependency] private readonly ContainerSystem _container = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnDoAfter); - SubscribeLocalEvent(OnGibbed); // 220 Dragon Bodies Fix + SubscribeLocalEvent(OnGibbed); } private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args) @@ -53,7 +55,7 @@ private void OnGibbed(EntityUid uid, DevourerComponent component, BeingGibbedEve { if (component.ShouldStoreDevoured) { - ContainerSystem.EmptyContainer(component.Stomach); + _container.EmptyContainer(component.Stomach); } } // End 220 Dragon Bodies Fix From 8a40e56e31d17e54bbad5a19ced3f7c552367757 Mon Sep 17 00:00:00 2001 From: Jesse-sama <42539014+MiraHell@users.noreply.github.com> Date: Sun, 2 Jun 2024 23:07:36 +0300 Subject: [PATCH 5/6] function fix --- Content.Server/Devour/DevourSystem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs index c7aadf9645e2..6e364ca34268 100644 --- a/Content.Server/Devour/DevourSystem.cs +++ b/Content.Server/Devour/DevourSystem.cs @@ -51,11 +51,11 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter } // Start 220 Dragon Bodies Fix - private void OnGibbed(EntityUid uid, DevourerComponent component, BeingGibbedEvent args) + private void OnGibbed(Entity ent, ref BeingGibbedEvent args) { - if (component.ShouldStoreDevoured) + if (ent.Comp.ShouldStoreDevoured) { - _container.EmptyContainer(component.Stomach); + _container.EmptyContainer(ent.Comp.Stomach); } } // End 220 Dragon Bodies Fix From 5584f786a9f15de33156a81926fbe7126e75e951 Mon Sep 17 00:00:00 2001 From: Jesse-sama <42539014+MiraHell@users.noreply.github.com> Date: Sun, 2 Jun 2024 23:27:06 +0300 Subject: [PATCH 6/6] dragon gib without rifts --- Content.Server/Dragon/DragonSystem.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index 1e29b80ebafb..5ce8e98ce623 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -15,6 +15,7 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Map; using Robust.Shared.Map.Components; +using Content.Server.Body.Systems; namespace Content.Server.Dragon; @@ -29,6 +30,7 @@ public sealed partial class DragonSystem : EntitySystem [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly BodySystem _body = default!; private EntityQuery _objQuery; @@ -100,7 +102,8 @@ public override void Update(float frameTime) if (comp.RiftAccumulator >= comp.RiftMaxAccumulator) { Roar(uid, comp); - QueueDel(uid); + // QueueDel(uid); + _body.GibBody(uid); //220 Dragon Bodies Fix } } }