forked from space-syndicate/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstr…
…eam-sync # Conflicts: # .github/workflows/publish.yml # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Security/Defusal.xml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
- Loading branch information
Showing
341 changed files
with
7,312 additions
and
3,175 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| using Content.Shared.Anomaly.Components; | ||
| using Content.Shared.Anomaly.Effects; | ||
| using Content.Shared.Body.Components; | ||
| using Robust.Client.GameObjects; | ||
|
|
||
| namespace Content.Client.Anomaly.Effects; | ||
|
|
||
| public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem | ||
| { | ||
| public override void Initialize() | ||
| { | ||
| SubscribeLocalEvent<InnerBodyAnomalyComponent, AfterAutoHandleStateEvent>(OnAfterHandleState); | ||
| SubscribeLocalEvent<InnerBodyAnomalyComponent, ComponentShutdown>(OnCompShutdown); | ||
| } | ||
|
|
||
| private void OnAfterHandleState(Entity<InnerBodyAnomalyComponent> ent, ref AfterAutoHandleStateEvent args) | ||
| { | ||
| if (!TryComp<SpriteComponent>(ent, out var sprite)) | ||
| return; | ||
|
|
||
| if (ent.Comp.FallbackSprite is null) | ||
| return; | ||
|
|
||
| if (!sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index)) | ||
| index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap); | ||
|
|
||
| if (TryComp<BodyComponent>(ent, out var body) && | ||
| body.Prototype is not null && | ||
| ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite)) | ||
| { | ||
| sprite.LayerSetSprite(index, speciesSprite); | ||
| } | ||
| else | ||
| { | ||
| sprite.LayerSetSprite(index, ent.Comp.FallbackSprite); | ||
| } | ||
|
|
||
| sprite.LayerSetVisible(index, true); | ||
| sprite.LayerSetShader(index, "unshaded"); | ||
| } | ||
|
|
||
| private void OnCompShutdown(Entity<InnerBodyAnomalyComponent> ent, ref ComponentShutdown args) | ||
| { | ||
| if (!TryComp<SpriteComponent>(ent, out var sprite)) | ||
| return; | ||
|
|
||
| var index = sprite.LayerMapGet(ent.Comp.LayerMap); | ||
| sprite.LayerSetVisible(index, false); | ||
| } | ||
| } |
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
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,45 @@ | ||
| using Content.Shared.Guidebook; | ||
|
|
||
| namespace Content.Client.Guidebook; | ||
|
|
||
| /// <summary> | ||
| /// Client system for storing and retrieving values extracted from entity prototypes | ||
| /// for display in the guidebook (<see cref="RichText.ProtodataTag"/>). | ||
| /// Requests data from the server on <see cref="Initialize"/>. | ||
| /// Can also be pushed new data when the server reloads prototypes. | ||
| /// </summary> | ||
| public sealed class GuidebookDataSystem : EntitySystem | ||
| { | ||
| private GuidebookData? _data; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeNetworkEvent<UpdateGuidebookDataEvent>(OnServerUpdated); | ||
|
|
||
| // Request data from the server | ||
| RaiseNetworkEvent(new RequestGuidebookDataEvent()); | ||
| } | ||
|
|
||
| private void OnServerUpdated(UpdateGuidebookDataEvent args) | ||
| { | ||
| // Got new data from the server, either in response to our request, or because prototypes reloaded on the server | ||
| _data = args.Data; | ||
| _data.Freeze(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Attempts to retrieve a value using the given identifiers. | ||
| /// See <see cref="GuidebookData.TryGetValue"/> for more information. | ||
| /// </summary> | ||
| public bool TryGetValue(string prototype, string component, string field, out object? value) | ||
| { | ||
| if (_data == null) | ||
| { | ||
| value = null; | ||
| return false; | ||
| } | ||
| return _data.TryGetValue(prototype, component, field, out value); | ||
| } | ||
| } |
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,49 @@ | ||
| using System.Globalization; | ||
| using Robust.Client.UserInterface.RichText; | ||
| using Robust.Shared.Utility; | ||
|
|
||
| namespace Content.Client.Guidebook.RichText; | ||
|
|
||
| /// <summary> | ||
| /// RichText tag that can display values extracted from entity prototypes. | ||
| /// In order to be accessed by this tag, the desired field/property must | ||
| /// be tagged with <see cref="Shared.Guidebook.GuidebookDataAttribute"/>. | ||
| /// </summary> | ||
| public sealed class ProtodataTag : IMarkupTag | ||
| { | ||
| [Dependency] private readonly ILogManager _logMan = default!; | ||
| [Dependency] private readonly IEntityManager _entMan = default!; | ||
|
|
||
| public string Name => "protodata"; | ||
| private ISawmill Log => _log ??= _logMan.GetSawmill("protodata_tag"); | ||
| private ISawmill? _log; | ||
|
|
||
| public string TextBefore(MarkupNode node) | ||
| { | ||
| // Do nothing with an empty tag | ||
| if (!node.Value.TryGetString(out var prototype)) | ||
| return string.Empty; | ||
|
|
||
| if (!node.Attributes.TryGetValue("comp", out var component)) | ||
| return string.Empty; | ||
| if (!node.Attributes.TryGetValue("member", out var member)) | ||
| return string.Empty; | ||
| node.Attributes.TryGetValue("format", out var format); | ||
|
|
||
| var guidebookData = _entMan.System<GuidebookDataSystem>(); | ||
|
|
||
| // Try to get the value | ||
| if (!guidebookData.TryGetValue(prototype, component.StringValue!, member.StringValue!, out var value)) | ||
| { | ||
| Log.Error($"Failed to find protodata for {component}.{member} in {prototype}"); | ||
| return "???"; | ||
| } | ||
|
|
||
| // If we have a format string and a formattable value, format it as requested | ||
| if (!string.IsNullOrEmpty(format.StringValue) && value is IFormattable formattable) | ||
| return formattable.ToString(format.StringValue, CultureInfo.CurrentCulture); | ||
|
|
||
| // No format string given, so just use default ToString | ||
| return value?.ToString() ?? "NULL"; | ||
| } | ||
| } |
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
Oops, something went wrong.