Skip to content

Commit

Permalink
Merge branch 'new-frontiers-14:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
VividPups authored Mar 28, 2024
2 parents 4663a73 + 21ac8d3 commit ef72794
Show file tree
Hide file tree
Showing 15 changed files with 3,132 additions and 1,497 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,11 @@ public sealed partial class GibOnTriggerComponent : Component
[ViewVariables(VVAccess.ReadWrite)]
[DataField("deleteItems")]
public bool DeleteItems = false;

/// <summary>
/// Frontier - Should gibbing also delete the owners organs?
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("deleteOrgans")]
public bool DeleteOrgans = false;
}
14 changes: 14 additions & 0 deletions Content.Server/Explosion/EntitySystems/TriggerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
using Robust.Shared.Random;
using Robust.Shared.Player;
using Content.Shared.Coordinates;
using Content.Shared.Body.Components; // Frontier - Gib organs

namespace Content.Server.Explosion.EntitySystems
{
Expand Down Expand Up @@ -175,6 +176,19 @@ private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, Tr
Del(item);
}
}

if (component.DeleteOrgans) // Frontier - Gib organs
{
if (TryComp<BodyComponent>(xform.ParentUid, out var body))
{
var organs = _body.GetBodyOrganComponents<TransformComponent>(xform.ParentUid, body);
foreach (var (_, organ) in organs)
{
Del(organ.Owner);
}
}
} // Frontier

_body.GibBody(xform.ParentUid, true);
args.Handled = true;
}
Expand Down
13 changes: 13 additions & 0 deletions Content.Shared/Bed/Sleep/AutoWakeUpComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Content.Shared.FixedPoint;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;

namespace Content.Shared.Bed.Sleep;

/// <summary>
/// Frontier - Added to AI to allow auto waking up after 5 secs.
/// </summary>
[NetworkedComponent, RegisterComponent]
public sealed partial class AutoWakeUpComponent : Component
{
}
11 changes: 11 additions & 0 deletions Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using System.Threading.Tasks; // Frontier

namespace Content.Server.Bed.Sleep
{
Expand Down Expand Up @@ -38,6 +39,16 @@ private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent

// TODO remove hardcoded time.
_actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15));

if (TryComp<AutoWakeUpComponent>(uid, out var autoWakeUp)) // Frontier
{
Task.Run(async () =>
{
await Task.Delay(TimeSpan.FromSeconds(5));
ev = new SleepStateChangedEvent(false);
RaiseLocalEvent(uid, ev);
});
} // Frontier
}

private void OnShutdown(EntityUid uid, SleepingComponent component, ComponentShutdown args)
Expand Down
7 changes: 7 additions & 0 deletions Content.Shared/Buckle/Components/BuckleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ public sealed partial class BuckleComponent : Component
/// Used for client rendering
/// </summary>
[ViewVariables] public int? OriginalDrawDepth;

/// <summary>
/// Frontier - True if the entity is blocked from buckling.
/// </summary>
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public bool Disable;
}

[ByRefEvent]
Expand Down
3 changes: 3 additions & 0 deletions Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ private bool CanBuckle(
if (attemptEvent.Cancelled)
return false;

if (buckleComp.Disable) // Frontier
return false; // Frontier

return true;
}

Expand Down
32 changes: 32 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3808,3 +3808,35 @@ Entries:
message: Removed Tranquilizer rounds from LibertyVend.
id: 4883
time: '2024-03-26T09:57:43.0000000+00:00'
- author: dvir01
changes:
- type: Tweak
message: >-
Syndicate agents are now more agitated, refusing to sit, and having
issues with sleeping for long duration.
id: 4884
time: '2024-03-26T22:52:38.0000000+00:00'
- author: VMSolidus
changes:
- type: Fix
message: >-
Harpies now correctly trill, tweet, chirp, and caw instead of
miraculously screeching about missing localizations.
id: 4885
time: '2024-03-27T12:31:17.0000000+00:00'
- author: MagnusCrowe
changes:
- type: Add
message: Added beacons and maps to the station.
- type: Add
message: Added cameras to the station.
- type: Tweak
message: Remodeled SR office.
- type: Tweak
message: Swapped brig and theater locations.
- type: Fix
message: Fixed disposals.
- type: Fix
message: Named bus docks for STC.
id: 4886
time: '2024-03-27T20:49:47.0000000+00:00'
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ chat-speech-verb-felinid-1 = mraows
chat-speech-verb-felinid-2 = mews
chat-speech-verb-felinid-3 = meows
chat-speech-verb-felinid-4 = purrs out
chat-speech-verb-harpy-1 = chirps
chat-speech-verb-harpy-2 = tweets
chat-speech-verb-harpy-3 = caws
chat-speech-verb-harpy-4 = trills
4 changes: 0 additions & 4 deletions Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl

This file was deleted.

Loading

0 comments on commit ef72794

Please sign in to comment.