forked from space-syndicate/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into changeling-antag-port
- Loading branch information
Showing
1,551 changed files
with
750,735 additions
and
419,163 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
using Content.Shared.Timing; | ||
using Content.Shared.Cargo.Systems; | ||
|
||
namespace Content.Client.Cargo.Systems; | ||
|
||
/// <summary> | ||
/// This handles... | ||
/// </summary> | ||
public sealed class ClientPriceGunSystem : SharedPriceGunSystem | ||
{ | ||
[Dependency] private readonly UseDelaySystem _useDelay = default!; | ||
|
||
protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user) | ||
{ | ||
if (!TryComp(priceGunUid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((priceGunUid, useDelay))) | ||
return false; | ||
|
||
// It feels worse if the cooldown is predicted but the popup isn't! So only do the cooldown reset on the server. | ||
return true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
using Content.Client.UserInterface.Fragments; | ||
using Content.Shared.CartridgeLoader.Cartridges; | ||
using Robust.Client.UserInterface; | ||
|
||
namespace Content.Client.CartridgeLoader.Cartridges; | ||
|
||
public sealed partial class WantedListUi : UIFragment | ||
{ | ||
private WantedListUiFragment? _fragment; | ||
|
||
public override Control GetUIFragmentRoot() | ||
{ | ||
return _fragment!; | ||
} | ||
|
||
public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner) | ||
{ | ||
_fragment = new WantedListUiFragment(); | ||
} | ||
|
||
public override void UpdateState(BoundUserInterfaceState state) | ||
{ | ||
switch (state) | ||
{ | ||
case WantedListUiState cast: | ||
_fragment?.UpdateState(cast.Records); | ||
break; | ||
} | ||
} | ||
} |
Oops, something went wrong.