From d8ae58efa903749314e334278c1a47c0fddd2b16 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:57:12 +1000 Subject: [PATCH 01/23] Station AI (#30944) * Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes --- Content.Client/Chat/UI/EmotesMenu.xaml.cs | 13 +- .../Laws/SiliconLawEditUi/SiliconLawEui.cs | 2 +- .../StationAi/StationAiBoundUserInterface.cs | 28 ++ .../Silicons/StationAi/StationAiMenu.xaml | 13 + .../Silicons/StationAi/StationAiMenu.xaml.cs | 128 ++++++ .../Silicons/StationAi/StationAiOverlay.cs | 23 +- .../StationAi/StationAiSystem.Airlock.cs | 30 ++ .../StationAi/StationAiSystem.Light.cs | 32 ++ .../Silicons/StationAi/StationAiSystem.cs | 6 +- Content.Client/Verbs/VerbSystem.cs | 5 +- .../Administration/Systems/AdminVerbSystem.cs | 1 + .../CommunicationsConsoleSystem.cs | 4 - .../DeviceNetworkRequiresPowerSystem.cs | 1 - .../Light/EntitySystems/LitOnPoweredSystem.cs | 1 - .../Light/EntitySystems/PoweredLightSystem.cs | 1 - Content.Server/Mind/MindSystem.cs | 4 +- .../Power/EntitySystems/ChargerSystem.cs | 35 +- .../Power/EntitySystems/PowerNetSystem.cs | 1 - .../Power/Generation/Teg/TegSystem.cs | 1 - .../Power/Generator/GasPowerReceiverSystem.cs | 1 - .../Silicons/Laws/SiliconLawSystem.cs | 35 +- .../StationAi/AiInteractWireAction.cs | 37 ++ .../Silicons/StationAi/AiVisionWireAction.cs | 40 ++ .../Silicons/StationAi/StationAiSystem.cs | 76 ++++ .../Sound/SpamEmitSoundRequirePowerSystem.cs | 1 - .../Station/Systems/StationSpawningSystem.cs | 23 + .../Melee/EnergySword/EnergySwordSystem.cs | 2 +- .../ArtifactElectricityTriggerSystem.cs | 2 +- .../ActionBlocker/ActionBlockerSystem.cs | 15 + .../Climbing/Systems/ClimbSystem.cs | 20 + .../Configurable/ConfigurationComponent.cs | 3 +- Content.Shared/Doors/AirlockWireStatus.cs | 2 +- Content.Shared/Examine/ExamineSystemShared.cs | 34 +- .../Interaction/SharedInteractionSystem.cs | 67 ++- .../LightOnCollideColliderComponent.cs | 13 + .../Components/LightOnCollideComponent.cs | 11 + .../Light/EntitySystems/LightCollideSystem.cs | 82 ++++ .../EntitySystems/SlimPoweredLightSystem.cs | 1 - Content.Shared/Mind/SharedMindSystem.cs | 4 + .../Components/SiliconLawBoundComponent.cs | 15 +- .../Components/SiliconLawUpdaterComponent.cs | 17 + .../Laws/SharedSiliconLawSystem.Updater.cs | 17 + .../Silicons/Laws/SharedSiliconLawSystem.cs | 3 +- .../SharedStationAiSystem.Airlock.cs | 25 ++ .../StationAi/SharedStationAiSystem.Held.cs | 187 ++++++++ .../StationAi/SharedStationAiSystem.Light.cs | 28 ++ .../StationAi/SharedStationAiSystem.cs | 412 ++++++++++++++++++ .../StationAi/StationAiCoreComponent.cs | 32 ++ .../StationAi/StationAiHeldComponent.cs | 9 + .../StationAi/StationAiHolderComponent.cs | 16 + .../StationAi/StationAiVisionComponent.cs | 5 +- .../StationAi/StationAiVisionSystem.cs | 131 ++---- .../StationAi/StationAiWhitelistComponent.cs | 13 + .../Station/SharedStationSpawningSystem.cs | 3 + .../UserInterface/ActivatableUIComponent.cs | 8 +- .../UserInterface/ActivatableUISystem.cs | 25 +- Content.Shared/Verbs/SharedVerbSystem.cs | 17 +- Content.Shared/Verbs/VerbEvents.cs | 8 +- Content.Shared/Wires/SharedWiresSystem.cs | 20 +- .../Audio/Effects/Footsteps/attributions.yml | 2 +- .../Audio/Effects/Footsteps/borgwalk2.ogg | Bin 20233 -> 9052 bytes .../administration/ui/silicon-law-ui.ftl | 2 + .../Locale/en-US/job/department-desc.ftl | 1 + Resources/Locale/en-US/job/department.ftl | 1 + .../Locale/en-US/job/job-description.ftl | 1 + Resources/Locale/en-US/job/job-names.ftl | 2 + .../Locale/en-US/silicons/station-ai.ftl | 14 + Resources/Maps/Test/dev_map.yml | 7 + Resources/Prototypes/Datasets/Names/ai.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 3 + .../Entities/Mobs/Cyborgs/borg_chassis.yml | 6 + .../Entities/Mobs/NPCs/revenant.yml | 9 +- .../Entities/Mobs/NPCs/simplemob.yml | 1 + .../Entities/Mobs/Player/observer.yml | 53 ++- .../Entities/Mobs/Player/silicon.yml | 303 +++++++++++++ .../Prototypes/Entities/Mobs/Species/base.yml | 1 + Resources/Prototypes/Entities/Mobs/base.yml | 7 + .../Fun/Instruments/base_instruments.yml | 2 +- .../Entities/Objects/Misc/paper.yml | 4 +- .../Objects/Specific/Robotics/mmi.yml | 2 +- .../Objects/Tools/access_configurator.yml | 2 +- .../Doors/Airlocks/base_structureairlocks.yml | 3 + .../Machines/Computers/computers.yml | 44 ++ .../Structures/Machines/Medical/cryo_pod.yml | 2 +- .../Entities/Structures/Power/apc.yml | 1 + .../Structures/Wallmounts/intercom.yml | 1 + .../Wallmounts/surveillance_camera.yml | 24 + .../Entities/Structures/Wallmounts/timer.yml | 1 + .../Prototypes/Roles/Jobs/Science/borg.yml | 15 + .../Prototypes/Roles/Jobs/departments.yml | 10 +- .../Prototypes/Roles/play_time_trackers.yml | 3 + Resources/Prototypes/StatusIcon/job.yml | 8 + Resources/Prototypes/Wires/layouts.yml | 4 +- Resources/Prototypes/tags.yml | 3 + .../Actions/actions_ai.rsi/ai_core.png | Bin 0 -> 269 bytes .../Actions/actions_ai.rsi/camera_light.png | Bin 0 -> 309 bytes .../Actions/actions_ai.rsi/crew_monitor.png | Bin 0 -> 295 bytes .../Actions/actions_ai.rsi/manifest.png | Bin 0 -> 245 bytes .../Actions/actions_ai.rsi/meta.json | 26 ++ .../Actions/actions_ai.rsi/state_laws.png | Bin 0 -> 241 bytes .../Misc/job_icons.rsi/StationAi.png | Bin 0 -> 204 bytes .../Interface/Misc/job_icons.rsi/meta.json | 5 +- .../Textures/Interface/noise.rsi/meta.json | 58 +++ .../Textures/Interface/noise.rsi/noise.png | Bin 0 -> 45602 bytes .../Silicon/output.rsi/ai-banned-unshaded.png | Bin 0 -> 820 bytes .../Mobs/Silicon/output.rsi/ai-banned.png | Bin 0 -> 1589 bytes .../output.rsi/ai-banned_dead-unshaded.png | Bin 0 -> 109 bytes .../Silicon/output.rsi/ai-banned_dead.png | Bin 0 -> 463 bytes .../Silicon/output.rsi/ai-empty-unshaded.png | Bin 0 -> 109 bytes .../Mobs/Silicon/output.rsi/ai-empty.png | Bin 0 -> 451 bytes .../output.rsi/ai-holo-old-unshaded.png | Bin 0 -> 2483 bytes .../Mobs/Silicon/output.rsi/ai-holo-old.png | Bin 0 -> 7280 bytes .../Mobs/Silicon/output.rsi/ai-unshaded.png | Bin 0 -> 6255 bytes .../Textures/Mobs/Silicon/output.rsi/ai.png | Bin 0 -> 6761 bytes .../Silicon/output.rsi/ai_dead-unshaded.png | Bin 0 -> 453 bytes .../Mobs/Silicon/output.rsi/ai_dead.png | Bin 0 -> 453 bytes .../Silicon/output.rsi/default-unshaded.png | Bin 0 -> 2005 bytes .../Mobs/Silicon/output.rsi/default.png | Bin 0 -> 2005 bytes .../output.rsi/floating_face-unshaded.png | Bin 0 -> 721 bytes .../Mobs/Silicon/output.rsi/floating_face.png | Bin 0 -> 721 bytes .../Silicon/output.rsi/horror-unshaded.png | Bin 0 -> 1777 bytes .../Mobs/Silicon/output.rsi/horror.png | Bin 0 -> 1404 bytes .../Mobs/Silicon/output.rsi/meta.json | 1 + .../output.rsi/xeno_queen-unshaded.png | Bin 0 -> 2484 bytes .../Mobs/Silicon/output.rsi/xeno_queen.png | Bin 0 -> 2484 bytes .../Mobs/Silicon/station_ai.rsi/ai.png | Bin 0 -> 9757 bytes .../Mobs/Silicon/station_ai.rsi/ai_dead.png | Bin 0 -> 4405 bytes .../Mobs/Silicon/station_ai.rsi/ai_empty.png | Bin 0 -> 4405 bytes .../Mobs/Silicon/station_ai.rsi/base.png | Bin 0 -> 4421 bytes .../Mobs/Silicon/station_ai.rsi/default.png | Bin 0 -> 2082 bytes .../Mobs/Silicon/station_ai.rsi/meta.json | 52 +++ .../Objects/Devices/ai_card.rsi/base.png | Bin 0 -> 4432 bytes .../Objects/Devices/ai_card.rsi/empty.png | Bin 0 -> 4292 bytes .../Objects/Devices/ai_card.rsi/full.png | Bin 0 -> 5121 bytes .../Devices/ai_card.rsi/inhand-left.png | Bin 0 -> 306 bytes .../Devices/ai_card.rsi/inhand-right.png | Bin 0 -> 316 bytes .../Objects/Devices/ai_card.rsi/meta.json | 58 +++ .../output.rsi/aicard-full-unshaded.png | Bin 0 -> 777 bytes .../Devices/output.rsi/aicard-full.png | Bin 0 -> 1746 bytes .../Devices/output.rsi/aicard-unshaded.png | Bin 0 -> 138 bytes .../Objects/Devices/output.rsi/aicard.png | Bin 0 -> 414 bytes .../Objects/Devices/output.rsi/meta.json | 1 + 142 files changed, 2278 insertions(+), 256 deletions(-) create mode 100644 Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs create mode 100644 Content.Client/Silicons/StationAi/StationAiMenu.xaml create mode 100644 Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs create mode 100644 Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs create mode 100644 Content.Client/Silicons/StationAi/StationAiSystem.Light.cs create mode 100644 Content.Server/Silicons/StationAi/AiInteractWireAction.cs create mode 100644 Content.Server/Silicons/StationAi/AiVisionWireAction.cs create mode 100644 Content.Server/Silicons/StationAi/StationAiSystem.cs create mode 100644 Content.Shared/Light/Components/LightOnCollideColliderComponent.cs create mode 100644 Content.Shared/Light/Components/LightOnCollideComponent.cs create mode 100644 Content.Shared/Light/EntitySystems/LightCollideSystem.cs create mode 100644 Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs create mode 100644 Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs create mode 100644 Resources/Locale/en-US/silicons/station-ai.ftl create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/ai_core.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/camera_light.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/crew_monitor.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/manifest.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/state_laws.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/StationAi.png create mode 100644 Resources/Textures/Interface/noise.rsi/meta.json create mode 100644 Resources/Textures/Interface/noise.rsi/noise.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/default.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/floating_face.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/horror-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/horror.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_dead.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_empty.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/default.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/base.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/empty.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/full.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/meta.json create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-full.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-unshaded.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/meta.json diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml.cs b/Content.Client/Chat/UI/EmotesMenu.xaml.cs index 33407553438..f3b7837f21a 100644 --- a/Content.Client/Chat/UI/EmotesMenu.xaml.cs +++ b/Content.Client/Chat/UI/EmotesMenu.xaml.cs @@ -19,9 +19,6 @@ public sealed partial class EmotesMenu : RadialMenu [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ISharedPlayerManager _playerManager = default!; - private readonly SpriteSystem _spriteSystem; - private readonly EntityWhitelistSystem _whitelistSystem; - public event Action>? OnPlayEmote; public EmotesMenu() @@ -29,8 +26,8 @@ public EmotesMenu() IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - _spriteSystem = _entManager.System(); - _whitelistSystem = _entManager.System(); + var spriteSystem = _entManager.System(); + var whitelistSystem = _entManager.System(); var main = FindControl("Main"); @@ -40,8 +37,8 @@ public EmotesMenu() var player = _playerManager.LocalSession?.AttachedEntity; if (emote.Category == EmoteCategory.Invalid || emote.ChatTriggers.Count == 0 || - !(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) || - _whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value)) + !(player.HasValue && whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) || + whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value)) continue; if (!emote.Available && @@ -63,7 +60,7 @@ public EmotesMenu() { VerticalAlignment = VAlignment.Center, HorizontalAlignment = HAlignment.Center, - Texture = _spriteSystem.Frame0(emote.Icon), + Texture = spriteSystem.Frame0(emote.Icon), TextureScale = new Vector2(2f, 2f), }; diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs index a4d59d1f315..03c74032f73 100644 --- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs @@ -6,7 +6,7 @@ namespace Content.Client.Silicons.Laws.SiliconLawEditUi; public sealed class SiliconLawEui : BaseEui { - public readonly EntityManager _entityManager = default!; + private readonly EntityManager _entityManager; private SiliconLawUi _siliconLawUi; private EntityUid _target; diff --git a/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs b/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs new file mode 100644 index 00000000000..68318305a0c --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs @@ -0,0 +1,28 @@ +using Content.Shared.Silicons.StationAi; +using Robust.Client.UserInterface; + +namespace Content.Client.Silicons.StationAi; + +public sealed class StationAiBoundUserInterface : BoundUserInterface +{ + private StationAiMenu? _menu; + + public StationAiBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + + protected override void Open() + { + base.Open(); + _menu = this.CreateWindow(); + _menu.Track(Owner); + + _menu.OnAiRadial += args => + { + SendPredictedMessage(new StationAiRadialMessage() + { + Event = args, + }); + }; + } +} diff --git a/Content.Client/Silicons/StationAi/StationAiMenu.xaml b/Content.Client/Silicons/StationAi/StationAiMenu.xaml new file mode 100644 index 00000000000..d56fc832898 --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiMenu.xaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs b/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs new file mode 100644 index 00000000000..24a802a60fe --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs @@ -0,0 +1,128 @@ +using System.Numerics; +using Content.Client.UserInterface.Controls; +using Content.Shared.Silicons.StationAi; +using Robust.Client.AutoGenerated; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Timing; + +namespace Content.Client.Silicons.StationAi; + +[GenerateTypedNameReferences] +public sealed partial class StationAiMenu : RadialMenu +{ + [Dependency] private readonly IClyde _clyde = default!; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IEyeManager _eyeManager = default!; + + public event Action? OnAiRadial; + + private EntityUid _tracked; + + public StationAiMenu() + { + IoCManager.InjectDependencies(this); + RobustXamlLoader.Load(this); + } + + public void Track(EntityUid owner) + { + _tracked = owner; + + if (!_entManager.EntityExists(_tracked)) + { + Close(); + return; + } + + BuildButtons(); + UpdatePosition(); + } + + private void BuildButtons() + { + var ev = new GetStationAiRadialEvent(); + _entManager.EventBus.RaiseLocalEvent(_tracked, ref ev); + + var main = FindControl("Main"); + main.DisposeAllChildren(); + var sprites = _entManager.System(); + + foreach (var action in ev.Actions) + { + // TODO: This radial boilerplate is quite annoying + var button = new StationAiMenuButton(action.Event) + { + StyleClasses = { "RadialMenuButton" }, + SetSize = new Vector2(64f, 64f), + ToolTip = action.Tooltip != null ? Loc.GetString(action.Tooltip) : null, + }; + + if (action.Sprite != null) + { + var texture = sprites.Frame0(action.Sprite); + var scale = Vector2.One; + + if (texture.Width <= 32) + { + scale *= 2; + } + + var tex = new TextureRect + { + VerticalAlignment = VAlignment.Center, + HorizontalAlignment = HAlignment.Center, + Texture = texture, + TextureScale = scale, + }; + + button.AddChild(tex); + } + + button.OnPressed += args => + { + OnAiRadial?.Invoke(action.Event); + Close(); + }; + main.AddChild(button); + } + } + + protected override void FrameUpdate(FrameEventArgs args) + { + base.FrameUpdate(args); + UpdatePosition(); + } + + private void UpdatePosition() + { + if (!_entManager.TryGetComponent(_tracked, out TransformComponent? xform)) + { + Close(); + return; + } + + if (!xform.Coordinates.IsValid(_entManager)) + { + Close(); + return; + } + + var coords = _entManager.System().GetSpriteScreenCoordinates((_tracked, null, xform)); + + if (!coords.IsValid) + { + Close(); + return; + } + + OpenScreenAt(coords.Position, _clyde); + } +} + +public sealed class StationAiMenuButton(BaseStationAiAction action) : RadialMenuTextureButton +{ + public BaseStationAiAction Action = action; +} diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs index efa1b8dbeff..15a8a3a63fe 100644 --- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs +++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs @@ -4,7 +4,9 @@ using Robust.Client.Player; using Robust.Shared.Enums; using Robust.Shared.Map.Components; +using Robust.Shared.Physics; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Content.Client.Silicons.StationAi; @@ -12,6 +14,7 @@ public sealed class StationAiOverlay : Overlay { [Dependency] private readonly IClyde _clyde = default!; [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IPrototypeManager _proto = default!; @@ -22,6 +25,9 @@ public sealed class StationAiOverlay : Overlay private IRenderTexture? _staticTexture; private IRenderTexture? _stencilTexture; + private float _updateRate = 1f / 30f; + private float _accumulator; + public StationAiOverlay() { IoCManager.InjectDependencies(this); @@ -47,19 +53,22 @@ protected override void Draw(in OverlayDrawArgs args) _entManager.TryGetComponent(playerEnt, out TransformComponent? playerXform); var gridUid = playerXform?.GridUid ?? EntityUid.Invalid; _entManager.TryGetComponent(gridUid, out MapGridComponent? grid); + _entManager.TryGetComponent(gridUid, out BroadphaseComponent? broadphase); var invMatrix = args.Viewport.GetWorldToLocalMatrix(); + _accumulator -= (float) _timing.FrameTime.TotalSeconds; - if (grid != null) + if (grid != null && broadphase != null) { - // TODO: Pass in attached entity's grid. - // TODO: Credit OD on the moved to code - // TODO: Call the moved-to code here. - - _visibleTiles.Clear(); var lookups = _entManager.System(); var xforms = _entManager.System(); - _entManager.System().GetView((gridUid, grid), worldBounds, _visibleTiles); + + if (_accumulator <= 0f) + { + _accumulator = MathF.Max(0f, _accumulator + _updateRate); + _visibleTiles.Clear(); + _entManager.System().GetView((gridUid, broadphase, grid), worldBounds, _visibleTiles); + } var gridMatrix = xforms.GetWorldMatrix(gridUid); var matty = Matrix3x2.Multiply(gridMatrix, invMatrix); diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs b/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs new file mode 100644 index 00000000000..bf6b65a9697 --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs @@ -0,0 +1,30 @@ +using Content.Shared.Doors.Components; +using Content.Shared.Silicons.StationAi; +using Robust.Shared.Utility; + +namespace Content.Client.Silicons.StationAi; + +public sealed partial class StationAiSystem +{ + private void InitializeAirlock() + { + SubscribeLocalEvent(OnDoorBoltGetRadial); + } + + private void OnDoorBoltGetRadial(Entity ent, ref GetStationAiRadialEvent args) + { + args.Actions.Add(new StationAiRadial() + { + Sprite = ent.Comp.BoltsDown ? + new SpriteSpecifier.Rsi( + new ResPath("/Textures/Structures/Doors/Airlocks/Standard/basic.rsi"), "open") : + new SpriteSpecifier.Rsi( + new ResPath("/Textures/Structures/Doors/Airlocks/Standard/basic.rsi"), "closed"), + Tooltip = ent.Comp.BoltsDown ? Loc.GetString("bolt-open") : Loc.GetString("bolt-close"), + Event = new StationAiBoltEvent() + { + Bolted = !ent.Comp.BoltsDown, + } + }); + } +} diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs b/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs new file mode 100644 index 00000000000..cf2f6136207 --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs @@ -0,0 +1,32 @@ +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Light.Components; +using Content.Shared.Silicons.StationAi; +using Robust.Shared.Utility; + +namespace Content.Client.Silicons.StationAi; + +public sealed partial class StationAiSystem +{ + // Used for surveillance camera lights + + private void InitializePowerToggle() + { + SubscribeLocalEvent(OnLightGetRadial); + } + + private void OnLightGetRadial(Entity ent, ref GetStationAiRadialEvent args) + { + if (!TryComp(ent.Owner, out ItemToggleComponent? toggle)) + return; + + args.Actions.Add(new StationAiRadial() + { + Tooltip = Loc.GetString("toggle-light"), + Sprite = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/light.svg.192dpi.png")), + Event = new StationAiLightEvent() + { + Enabled = !toggle.Activated + } + }); + } +} diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.cs b/Content.Client/Silicons/StationAi/StationAiSystem.cs index 2ed06175252..ab9ace3c1d5 100644 --- a/Content.Client/Silicons/StationAi/StationAiSystem.cs +++ b/Content.Client/Silicons/StationAi/StationAiSystem.cs @@ -5,7 +5,7 @@ namespace Content.Client.Silicons.StationAi; -public sealed partial class StationAiSystem : EntitySystem +public sealed partial class StationAiSystem : SharedStationAiSystem { [Dependency] private readonly IOverlayManager _overlayMgr = default!; [Dependency] private readonly IPlayerManager _player = default!; @@ -15,8 +15,8 @@ public sealed partial class StationAiSystem : EntitySystem public override void Initialize() { base.Initialize(); - // InitializeAirlock(); - // InitializePowerToggle(); + InitializeAirlock(); + InitializePowerToggle(); SubscribeLocalEvent(OnAiAttached); SubscribeLocalEvent(OnAiDetached); diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index 5f1f49e5fd0..2513210e2cc 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -70,6 +70,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true // Get entities List entities; + var examineFlags = LookupFlags.All & ~LookupFlags.Sensors; // Do we have to do FoV checks? if ((visibility & MenuVisibility.NoFov) == 0) @@ -85,7 +86,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true // Then check every entity entities = new(); - foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize)) + foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize, flags: examineFlags)) { if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner)) entities.Add(ent); @@ -93,7 +94,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true } else { - entities = _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize).ToList(); + entities = _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize, flags: examineFlags).ToList(); } if (entities.Count == 0) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 1e701794ffc..d9ccb730d0a 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -36,6 +36,7 @@ using System.Linq; using System.Numerics; using Content.Server.Silicons.Laws; +using Content.Shared.Silicons.Laws; using Content.Shared.Silicons.Laws.Components; using Robust.Server.Player; using Robust.Shared.Physics.Components; diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index c3e5b912549..de77d611c37 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -182,10 +182,6 @@ private static bool CanAnnounce(CommunicationsConsoleComponent comp) private bool CanUse(EntityUid user, EntityUid console) { - // This shouldn't technically be possible because of BUI but don't trust client. - if (!_interaction.InRangeUnobstructed(console, user)) - return false; - if (TryComp(console, out var accessReaderComponent) && !HasComp(console)) { return _accessReaderSystem.IsAllowed(user, console, accessReaderComponent); diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs index f47a5df8ac4..6e7bd255c5d 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs @@ -1,7 +1,6 @@ using Content.Server.DeviceNetwork.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; -using Content.Shared.Power.EntitySystems; namespace Content.Server.DeviceNetwork.Systems; diff --git a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs index 3c5f7eaecb2..5c66d65b573 100644 --- a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs +++ b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs @@ -2,7 +2,6 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Power; -using Content.Shared.Power.Components; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index c4a07b56a86..58ffd4f7b9d 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -27,7 +27,6 @@ using Content.Shared.Damage.Systems; using Content.Shared.Damage.Components; using Content.Shared.Power; -using Content.Shared.Power.Components; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index 4271d76b445..2e7c31ec7a6 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -341,13 +341,13 @@ public override void SetUserId(EntityUid mindId, NetUserId? userId, MindComponen } } - public void ControlMob(EntityUid user, EntityUid target) + public override void ControlMob(EntityUid user, EntityUid target) { if (TryComp(user, out ActorComponent? actor)) ControlMob(actor.PlayerSession.UserId, target); } - public void ControlMob(NetUserId user, EntityUid target) + public override void ControlMob(NetUserId user, EntityUid target) { var (mindId, mind) = GetOrCreateMind(user); diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index 2aa69024df3..40b998a95d0 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -8,7 +8,6 @@ using JetBrains.Annotations; using Robust.Shared.Containers; using System.Diagnostics.CodeAnalysis; -using Content.Shared.Power.Components; using Content.Shared.Storage.Components; using Robust.Server.Containers; using Content.Shared.Whitelist; @@ -44,7 +43,37 @@ private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStart private void OnChargerExamine(EntityUid uid, ChargerComponent component, ExaminedEvent args) { - args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate))); + using (args.PushGroup(nameof(ChargerComponent))) + { + // rate at which the charger charges + args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate))); + + // try to get contents of the charger + if (!_container.TryGetContainer(uid, component.SlotId, out var container)) + return; + + if (HasComp(uid)) + return; + + // if charger is empty and not a power cell type charger, add empty message + // power cells have their own empty message by default, for things like flash lights + if (container.ContainedEntities.Count == 0) + { + args.PushMarkup(Loc.GetString("charger-empty")); + } + else + { + // add how much each item is charged it + foreach (var contained in container.ContainedEntities) + { + if (!TryComp(contained, out var battery)) + continue; + + var chargePercentage = (battery.CurrentCharge / battery.MaxCharge) * 100; + args.PushMarkup(Loc.GetString("charger-content", ("chargePercentage", (int) chargePercentage))); + } + } + } } public override void Update(float frameTime) @@ -202,7 +231,7 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component) return CellChargerStatus.Charging; } - + private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerComponent component, float frameTime) { if (!TryComp(uid, out ApcPowerReceiverComponent? receiverComponent)) diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index 8dcb6240a56..6c35ba20083 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -5,7 +5,6 @@ using Content.Server.Power.Pow3r; using Content.Shared.CCVar; using Content.Shared.Power; -using Content.Shared.Power.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Configuration; diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs index dd09467efe0..43749dab8fa 100644 --- a/Content.Server/Power/Generation/Teg/TegSystem.cs +++ b/Content.Server/Power/Generation/Teg/TegSystem.cs @@ -11,7 +11,6 @@ using Content.Shared.DeviceNetwork; using Content.Shared.Examine; using Content.Shared.Power; -using Content.Shared.Power.Components; using Content.Shared.Power.Generation.Teg; using Content.Shared.Rounding; using Robust.Server.GameObjects; diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs index 5a1bd31a15c..e3979a65192 100644 --- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs +++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs @@ -6,7 +6,6 @@ using Content.Server.Power.Components; using Content.Shared.Atmos; using Content.Shared.Power; -using Content.Shared.Power.Components; namespace Content.Server.Power.Generator; diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index 0c0f68c23f3..6b7df52a6eb 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -5,12 +5,10 @@ using Content.Server.Radio.Components; using Content.Server.Roles; using Content.Server.Station.Systems; -using Content.Shared.Actions; using Content.Shared.Administration; using Content.Shared.Chat; using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; -using Content.Shared.Examine; using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Roles; @@ -19,10 +17,10 @@ using Content.Shared.Stunnable; using Content.Shared.Wires; using Robust.Server.GameObjects; +using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Toolshed; -using Robust.Shared.Utility; namespace Content.Server.Silicons.Laws; @@ -32,11 +30,9 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly UserInterfaceSystem _userInterface = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly SharedRoleSystem _roles = default!; /// @@ -44,7 +40,6 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentShutdown); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnMindAdded); SubscribeLocalEvent(OnToggleLawsScreen); @@ -58,15 +53,8 @@ public override void Initialize() SubscribeLocalEvent(OnEmagMindRemoved); } - private void OnComponentShutdown(EntityUid uid, SiliconLawBoundComponent component, ComponentShutdown args) - { - if (component.ViewLawsActionEntity != null) - _actions.RemoveAction(uid, component.ViewLawsActionEntity); - } - private void OnMapInit(EntityUid uid, SiliconLawBoundComponent component, MapInitEvent args) { - _actions.AddAction(uid, ref component.ViewLawsActionEntity, component.ViewLawsAction); GetLaws(uid, component); } @@ -92,7 +80,7 @@ private void OnToggleLawsScreen(EntityUid uid, SiliconLawBoundComponent componen private void OnBoundUIOpened(EntityUid uid, SiliconLawBoundComponent component, BoundUIOpenedEvent args) { - _entityManager.TryGetComponent(uid, out var intrinsicRadio); + TryComp(uid, out IntrinsicRadioTransmitterComponent? intrinsicRadio); var radioChannels = intrinsicRadio?.Channels; var state = new SiliconLawBuiState(GetLaws(uid).Laws, radioChannels); @@ -264,9 +252,9 @@ public void NotifyLawsChanged(EntityUid uid) /// /// Extract all the laws from a lawset's prototype ids. /// - public SiliconLawset GetLawset(string lawset) + public SiliconLawset GetLawset(ProtoId lawset) { - var proto = _prototype.Index(lawset); + var proto = _prototype.Index(lawset); var laws = new SiliconLawset() { Laws = new List(proto.Laws.Count) @@ -294,6 +282,21 @@ public void SetLaws(List newLaws, EntityUid target) component.Lawset.Laws = newLaws; NotifyLawsChanged(target); } + + protected override void OnUpdaterInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + // TODO: Prediction dump this + if (!TryComp(args.Entity, out SiliconLawProviderComponent? provider)) + return; + + var lawset = GetLawset(provider.Laws).Laws; + var query = EntityManager.CompRegistryQueryEnumerator(ent.Comp.Components); + + while (query.MoveNext(out var update)) + { + SetLaws(lawset, update); + } + } } [ToolshedCommand, AdminCommand(AdminFlags.Admin)] diff --git a/Content.Server/Silicons/StationAi/AiInteractWireAction.cs b/Content.Server/Silicons/StationAi/AiInteractWireAction.cs new file mode 100644 index 00000000000..c92c825b32b --- /dev/null +++ b/Content.Server/Silicons/StationAi/AiInteractWireAction.cs @@ -0,0 +1,37 @@ +using Content.Server.Wires; +using Content.Shared.Doors; +using Content.Shared.Silicons.StationAi; +using Content.Shared.Wires; + +namespace Content.Server.Silicons.StationAi; + +/// +/// Controls whether an AI can interact with the target entity. +/// +public sealed partial class AiInteractWireAction : ComponentWireAction +{ + public override string Name { get; set; } = "wire-name-ai-act-light"; + public override Color Color { get; set; } = Color.DeepSkyBlue; + public override object StatusKey => AirlockWireStatus.AiControlIndicator; + + public override StatusLightState? GetLightState(Wire wire, StationAiWhitelistComponent component) + { + return component.Enabled ? StatusLightState.On : StatusLightState.Off; + } + + public override bool Cut(EntityUid user, Wire wire, StationAiWhitelistComponent component) + { + return EntityManager.System() + .SetWhitelistEnabled((component.Owner, component), false, announce: true); + } + + public override bool Mend(EntityUid user, Wire wire, StationAiWhitelistComponent component) + { + return EntityManager.System() + .SetWhitelistEnabled((component.Owner, component), true); + } + + public override void Pulse(EntityUid user, Wire wire, StationAiWhitelistComponent component) + { + } +} diff --git a/Content.Server/Silicons/StationAi/AiVisionWireAction.cs b/Content.Server/Silicons/StationAi/AiVisionWireAction.cs new file mode 100644 index 00000000000..3523f4d38f0 --- /dev/null +++ b/Content.Server/Silicons/StationAi/AiVisionWireAction.cs @@ -0,0 +1,40 @@ +using Content.Server.Wires; +using Content.Shared.Doors; +using Content.Shared.Silicons.StationAi; +using Content.Shared.StationAi; +using Content.Shared.Wires; + +namespace Content.Server.Silicons.StationAi; + +/// +/// Handles StationAiVision functionality for the attached entity. +/// +public sealed partial class AiVisionWireAction : ComponentWireAction +{ + public override string Name { get; set; } = "wire-name-ai-vision-light"; + public override Color Color { get; set; } = Color.DeepSkyBlue; + public override object StatusKey => AirlockWireStatus.AiControlIndicator; + + public override StatusLightState? GetLightState(Wire wire, StationAiVisionComponent component) + { + return component.Enabled ? StatusLightState.On : StatusLightState.Off; + } + + public override bool Cut(EntityUid user, Wire wire, StationAiVisionComponent component) + { + return EntityManager.System() + .SetVisionEnabled((component.Owner, component), false, announce: true); + } + + public override bool Mend(EntityUid user, Wire wire, StationAiVisionComponent component) + { + return EntityManager.System() + .SetVisionEnabled((component.Owner, component), true); + } + + public override void Pulse(EntityUid user, Wire wire, StationAiVisionComponent component) + { + // TODO: This should turn it off for a bit + // Need timer cleanup first out of scope. + } +} diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs new file mode 100644 index 00000000000..846497387d2 --- /dev/null +++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs @@ -0,0 +1,76 @@ +using System.Linq; +using Content.Server.Chat.Managers; +using Content.Server.Chat.Systems; +using Content.Shared.Chat; +using Content.Shared.Silicons.StationAi; +using Content.Shared.StationAi; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Map.Components; +using Robust.Shared.Player; + +namespace Content.Server.Silicons.StationAi; + +public sealed class StationAiSystem : SharedStationAiSystem +{ + [Dependency] private readonly IChatManager _chats = default!; + [Dependency] private readonly EntityLookupSystem _lookup = default!; + + private readonly HashSet> _ais = new(); + + public override bool SetVisionEnabled(Entity entity, bool enabled, bool announce = false) + { + if (!base.SetVisionEnabled(entity, enabled, announce)) + return false; + + if (announce) + { + AnnounceSnip(entity.Owner); + } + + return true; + } + + public override bool SetWhitelistEnabled(Entity entity, bool enabled, bool announce = false) + { + if (!base.SetWhitelistEnabled(entity, enabled, announce)) + return false; + + if (announce) + { + AnnounceSnip(entity.Owner); + } + + return true; + } + + private void AnnounceSnip(EntityUid entity) + { + var xform = Transform(entity); + + if (!TryComp(xform.GridUid, out MapGridComponent? grid)) + return; + + _ais.Clear(); + _lookup.GetChildEntities(xform.GridUid.Value, _ais); + var filter = Filter.Empty(); + + foreach (var ai in _ais) + { + // TODO: Filter API? + if (TryComp(ai.Owner, out ActorComponent? actorComp)) + { + filter.AddPlayer(actorComp.PlayerSession); + } + } + + // TEST + // filter = Filter.Broadcast(); + + // No easy way to do chat notif embeds atm. + var tile = Maps.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates); + var msg = Loc.GetString("ai-wire-snipped", ("coords", tile)); + + _chats.ChatMessageToMany(ChatChannel.Notifications, msg, msg, entity, false, true, filter.Recipients.Select(o => o.Channel)); + // Apparently there's no sound for this. + } +} diff --git a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs index d2c2a8a1ca7..1ad1bb6c0a1 100644 --- a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs +++ b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Power; -using Content.Shared.Power.Components; using Content.Shared.Sound; using Content.Shared.Sound.Components; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 79192d49b40..0662c54beec 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -139,6 +139,22 @@ public EntityUid SpawnPlayerMob( EntityUid? entity = null) { _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype); + RoleLoadout? loadout = null; + + // Need to get the loadout up-front to handle names if we use an entity spawn override. + var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID); + + if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto)) + { + profile?.Loadouts.TryGetValue(jobLoadout, out loadout); + + // Set to default if not present + if (loadout == null) + { + loadout = new RoleLoadout(jobLoadout); + loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); + } + } // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff. if (prototype?.JobEntity != null) @@ -146,6 +162,13 @@ public EntityUid SpawnPlayerMob( DebugTools.Assert(entity is null); var jobEntity = EntityManager.SpawnEntity(prototype.JobEntity, coordinates); MakeSentientCommand.MakeSentient(jobEntity, EntityManager); + + // Make sure custom names get handled, what is gameticker control flow whoopy. + if (loadout != null) + { + EquipRoleName(jobEntity, loadout, roleProto!); + } + DoJobSpecials(job, jobEntity); _identity.QueueIdentityUpdate(jobEntity); return jobEntity; diff --git a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs index 5970e163196..c9be87c6231 100644 --- a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs +++ b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs @@ -38,7 +38,7 @@ private void OnInteractUsing(EntityUid uid, EnergySwordComponent comp, InteractU if (args.Handled) return; - if (!_toolSystem.HasQuality(args.Used, "Pulsing")) + if (!_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality)) return; args.Handled = true; diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs index 019e09bbbbc..9d2fd58980f 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs @@ -44,7 +44,7 @@ private void OnInteractUsing(EntityUid uid, ArtifactElectricityTriggerComponent if (args.Handled) return; - if (!_toolSystem.HasQuality(args.Used, "Pulsing")) + if (!_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality)) return; args.Handled = _artifactSystem.TryActivateArtifact(uid, args.User); diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index d2883b5ef5b..bd6ee8cae1e 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Emoting; using Content.Shared.Hands; using Content.Shared.Interaction; +using Content.Shared.Interaction.Components; using Content.Shared.Interaction.Events; using Content.Shared.Item; using Content.Shared.Mobs; @@ -26,9 +27,14 @@ public sealed class ActionBlockerSystem : EntitySystem { [Dependency] private readonly SharedContainerSystem _container = default!; + private EntityQuery _complexInteractionQuery; + public override void Initialize() { base.Initialize(); + + _complexInteractionQuery = GetEntityQuery(); + SubscribeLocalEvent(OnMoverStartup); } @@ -57,6 +63,15 @@ public bool UpdateCanMove(EntityUid uid, InputMoverComponent? component = null) return !ev.Cancelled; } + /// + /// Checks if a given entity is able to do specific complex interactions. + /// This is used to gate manipulation to general humanoids. If a mouse shouldn't be able to do something, then it's complex. + /// + public bool CanComplexInteract(EntityUid user) + { + return _complexInteractionQuery.HasComp(user); + } + /// /// Raises an event directed at both the user and the target entity to check whether a user is capable of /// interacting with this entity. diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 722d97213f5..42fa89b3678 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -373,6 +373,26 @@ private void OnClimbEndCollide(EntityUid uid, ClimbingComponent component, ref E return; } + foreach (var contact in args.OurFixture.Contacts.Values) + { + if (!contact.IsTouching) + continue; + + var otherEnt = contact.OtherEnt(uid); + var (otherFixtureId, otherFixture) = contact.OtherFixture(uid); + + // TODO: Remove this on engine. + if (args.OtherEntity == otherEnt && args.OtherFixtureId == otherFixtureId) + continue; + + if (otherFixture is { Hard: true } && + _climbableQuery.HasComp(otherEnt)) + { + return; + } + } + + // TODO: Is this even needed anymore? foreach (var otherFixture in args.OurFixture.Contacts.Keys) { // If it's the other fixture then ignore em diff --git a/Content.Shared/Configurable/ConfigurationComponent.cs b/Content.Shared/Configurable/ConfigurationComponent.cs index 63a0dfe95a5..621871af3ce 100644 --- a/Content.Shared/Configurable/ConfigurationComponent.cs +++ b/Content.Shared/Configurable/ConfigurationComponent.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using Content.Shared.Tools; +using Content.Shared.Tools.Systems; using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; @@ -13,7 +14,7 @@ public sealed partial class ConfigurationComponent : Component public Dictionary Config = new(); [DataField("qualityNeeded", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string QualityNeeded = "Pulsing"; + public string QualityNeeded = SharedToolSystem.PulseQuality; [DataField("validation")] public Regex Validation = new("^[a-zA-Z0-9 ]*$", RegexOptions.Compiled); diff --git a/Content.Shared/Doors/AirlockWireStatus.cs b/Content.Shared/Doors/AirlockWireStatus.cs index a50ee2c88e9..d3fa15ed1b6 100644 --- a/Content.Shared/Doors/AirlockWireStatus.cs +++ b/Content.Shared/Doors/AirlockWireStatus.cs @@ -8,7 +8,7 @@ public enum AirlockWireStatus PowerIndicator, BoltIndicator, BoltLightIndicator, - AIControlIndicator, + AiControlIndicator, TimingIndicator, SafetyIndicator, } diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 397a8f74484..a1c30a2bd03 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -109,12 +109,25 @@ public virtual bool CanExamine(EntityUid examiner, MapCoordinates target, Ignore if (EntityManager.GetComponent(examiner).MapID != target.MapId) return false; - return InRangeUnOccluded( - _transform.GetMapCoordinates(examiner), - target, - GetExaminerRange(examiner), - predicate: predicate, - ignoreInsideBlocker: true); + // Do target InRangeUnoccluded which has different checks. + if (examined != null) + { + return InRangeUnOccluded( + examiner, + examined.Value, + GetExaminerRange(examiner), + predicate: predicate, + ignoreInsideBlocker: true); + } + else + { + return InRangeUnOccluded( + examiner, + target, + GetExaminerRange(examiner), + predicate: predicate, + ignoreInsideBlocker: true); + } } /// @@ -209,7 +222,14 @@ public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates othe public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var entMan = IoCManager.Resolve(); + var ev = new InRangeOverrideEvent(origin, other); + RaiseLocalEvent(origin, ref ev); + + if (ev.Handled) + { + return ev.InRange; + } + var originPos = _transform.GetMapCoordinates(origin); var otherPos = _transform.GetMapCoordinates(other); diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 24bb1b2446d..a2118205af1 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -20,6 +20,7 @@ using Content.Shared.Physics; using Content.Shared.Players.RateLimiting; using Content.Shared.Popups; +using Content.Shared.Silicons.StationAi; using Content.Shared.Storage; using Content.Shared.Strip; using Content.Shared.Tag; @@ -83,7 +84,6 @@ public abstract partial class SharedInteractionSystem : EntitySystem private EntityQuery _wallMountQuery; private EntityQuery _delayQuery; private EntityQuery _uiQuery; - private EntityQuery _complexInteractionQuery; private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable; @@ -106,7 +106,6 @@ public override void Initialize() _wallMountQuery = GetEntityQuery(); _delayQuery = GetEntityQuery(); _uiQuery = GetEntityQuery(); - _complexInteractionQuery = GetEntityQuery(); SubscribeLocalEvent(HandleUserInterfaceRangeCheck); SubscribeLocalEvent(OnBoundInterfaceInteractAttempt); @@ -191,7 +190,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev return; } - if (uiComp.RequireHands && !_handsQuery.HasComp(ev.Actor)) + if (uiComp.RequiresComplex && !_actionBlockerSystem.CanComplexInteract(ev.Actor)) ev.Cancel(); } @@ -477,10 +476,7 @@ private bool IsDeleted(EntityUid? uid) public void InteractHand(EntityUid user, EntityUid target) { - if (IsDeleted(user) || IsDeleted(target)) - return; - - var complexInteractions = SupportsComplexInteractions(user); + var complexInteractions = _actionBlockerSystem.CanComplexInteract(user); if (!complexInteractions) { InteractionActivate(user, @@ -666,6 +662,14 @@ public bool InRangeUnobstructed( if (!Resolve(other, ref other.Comp)) return false; + var ev = new InRangeOverrideEvent(origin, other); + RaiseLocalEvent(origin, ref ev); + + if (ev.Handled) + { + return ev.InRange; + } + return InRangeUnobstructed(origin, other, other.Comp.Coordinates, @@ -1188,7 +1192,7 @@ public bool AltInteract(EntityUid user, EntityUid target) // Get list of alt-interact verbs var verbs = _verbSystem.GetLocalVerbs(target, user, typeof(AlternativeVerb)); - if (!verbs.Any()) + if (verbs.Count == 0) return false; _verbSystem.ExecuteVerb(verbs.First(), user, target); @@ -1245,6 +1249,13 @@ public bool InRangeAndAccessible( /// public bool IsAccessible(Entity user, Entity target) { + var ev = new AccessibleOverrideEvent(user, target); + + RaiseLocalEvent(user, ref ev); + + if (ev.Handled) + return ev.Accessible; + if (_containerSystem.IsInSameOrParentContainer(user, target, out _, out var container)) return true; @@ -1396,13 +1407,10 @@ public bool TryGetUsedEntity(EntityUid user, [NotNullWhen(true)] out EntityUid? return ev.Handled; } - /// - /// Checks if a given entity is able to do specific complex interactions. - /// This is used to gate manipulation to general humanoids. If a mouse shouldn't be able to do something, then it's complex. - /// + [Obsolete("Use ActionBlockerSystem")] public bool SupportsComplexInteractions(EntityUid user) { - return _complexInteractionQuery.HasComp(user); + return _actionBlockerSystem.CanComplexInteract(user); } } @@ -1441,17 +1449,38 @@ public record struct GetUsedEntityEvent() }; /// - /// Raised directed by-ref on an item and a user to determine if interactions can occur. + /// Raised directed by-ref on an item to determine if hand interactions should go through. + /// Defaults to allowing hand interactions to go through. Cancel to force the item to be attacked instead. /// /// Whether the hand interaction should be cancelled. [ByRefEvent] - public record struct AttemptUseInteractEvent(EntityUid User, EntityUid Used, bool Cancelled = false); + public record struct CombatModeShouldHandInteractEvent(bool Cancelled = false); /// - /// Raised directed by-ref on an item to determine if hand interactions should go through. - /// Defaults to allowing hand interactions to go through. Cancel to force the item to be attacked instead. + /// Override event raised directed on the user to say the target is accessible. /// - /// Whether the hand interaction should be cancelled. + /// + /// [ByRefEvent] - public record struct CombatModeShouldHandInteractEvent(bool Cancelled = false); + public record struct AccessibleOverrideEvent(EntityUid User, EntityUid Target) + { + public readonly EntityUid User = User; + public readonly EntityUid Target = Target; + + public bool Handled; + public bool Accessible = false; + } + + /// + /// Override event raised directed on a user to check InRangeUnoccluded AND InRangeUnobstructed to the target if you require custom logic. + /// + [ByRefEvent] + public record struct InRangeOverrideEvent(EntityUid User, EntityUid Target) + { + public readonly EntityUid User = User; + public readonly EntityUid Target = Target; + + public bool Handled; + public bool InRange = false; + } } diff --git a/Content.Shared/Light/Components/LightOnCollideColliderComponent.cs b/Content.Shared/Light/Components/LightOnCollideColliderComponent.cs new file mode 100644 index 00000000000..39be05a1480 --- /dev/null +++ b/Content.Shared/Light/Components/LightOnCollideColliderComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +/// +/// Can activate when collided with. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class LightOnCollideColliderComponent : Component +{ + [DataField] + public string FixtureId = "lightTrigger"; +} diff --git a/Content.Shared/Light/Components/LightOnCollideComponent.cs b/Content.Shared/Light/Components/LightOnCollideComponent.cs new file mode 100644 index 00000000000..c3b4bd73965 --- /dev/null +++ b/Content.Shared/Light/Components/LightOnCollideComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +/// +/// Enables / disables pointlight whenever entities are contacting with it +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class LightOnCollideComponent : Component +{ +} diff --git a/Content.Shared/Light/EntitySystems/LightCollideSystem.cs b/Content.Shared/Light/EntitySystems/LightCollideSystem.cs new file mode 100644 index 00000000000..f09ae6824ea --- /dev/null +++ b/Content.Shared/Light/EntitySystems/LightCollideSystem.cs @@ -0,0 +1,82 @@ +using Content.Shared.Light.Components; +using Robust.Shared.Physics.Events; +using Robust.Shared.Physics.Systems; + +namespace Content.Shared.Light.EntitySystems; + +public sealed class LightCollideSystem : EntitySystem +{ + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SlimPoweredLightSystem _lights = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnPreventCollide); + SubscribeLocalEvent(OnStart); + SubscribeLocalEvent(OnEnd); + + SubscribeLocalEvent(OnCollideShutdown); + } + + private void OnCollideShutdown(Entity ent, ref ComponentShutdown args) + { + // TODO: Check this on the event. + if (TerminatingOrDeleted(ent.Owner)) + return; + + // Regenerate contacts for everything we were colliding with. + var contacts = _physics.GetContacts(ent.Owner); + + while (contacts.MoveNext(out var contact)) + { + if (!contact.IsTouching) + continue; + + var other = contact.OtherEnt(ent.Owner); + + if (HasComp(other)) + { + _physics.RegenerateContacts(other); + } + } + } + + // You may be wondering what de fok this is doing here. + // At the moment there's no easy way to do collision whitelists based on components. + private void OnPreventCollide(Entity ent, ref PreventCollideEvent args) + { + if (!HasComp(args.OtherEntity)) + { + args.Cancelled = true; + } + } + + private void OnEnd(Entity ent, ref EndCollideEvent args) + { + if (args.OurFixtureId != ent.Comp.FixtureId) + return; + + if (!HasComp(args.OtherEntity)) + return; + + // TODO: Engine bug IsTouching box2d yay. + var contacts = _physics.GetTouchingContacts(args.OtherEntity) - 1; + + if (contacts > 0) + return; + + _lights.SetEnabled(args.OtherEntity, false); + } + + private void OnStart(Entity ent, ref StartCollideEvent args) + { + if (args.OurFixtureId != ent.Comp.FixtureId) + return; + + if (!HasComp(args.OtherEntity)) + return; + + _lights.SetEnabled(args.OtherEntity, true); + } +} diff --git a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs index 6d984ed19a3..4cf9b25dadc 100644 --- a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs +++ b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.Light.Components; using Content.Shared.Power; -using Content.Shared.Power.Components; using Content.Shared.Power.EntitySystems; namespace Content.Shared.Light.EntitySystems; diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index 2b83f051904..994d230e8bd 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -315,6 +315,10 @@ public virtual void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostCh { } + public virtual void ControlMob(EntityUid user, EntityUid target) {} + + public virtual void ControlMob(NetUserId user, EntityUid target) {} + /// /// Tries to create and add an objective from its prototype id. /// diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs index 824d057b3ea..0fb9c5920fa 100644 --- a/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs +++ b/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; @@ -7,21 +8,9 @@ namespace Content.Shared.Silicons.Laws.Components; /// /// This is used for entities which are bound to silicon laws and can view them. /// -[RegisterComponent, Access(typeof(SharedSiliconLawSystem))] +[RegisterComponent, NetworkedComponent, Access(typeof(SharedSiliconLawSystem))] public sealed partial class SiliconLawBoundComponent : Component { - /// - /// The sidebar action that toggles the laws screen. - /// - [DataField] - public EntProtoId ViewLawsAction = "ActionViewLaws"; - - /// - /// The action for toggling laws. Stored here so we can remove it later. - /// - [DataField] - public EntityUid? ViewLawsActionEntity; - /// /// The last entity that provided laws to this entity. /// diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs new file mode 100644 index 00000000000..e28bf883d91 --- /dev/null +++ b/Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Silicons.Laws.Components; + +/// +/// Whenever an entity is inserted with silicon laws it will update the relevant entity's laws. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class SiliconLawUpdaterComponent : Component +{ + /// + /// Entities to update + /// + [DataField(required: true)] + public ComponentRegistry Components; +} diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs new file mode 100644 index 00000000000..9fbef58a842 --- /dev/null +++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs @@ -0,0 +1,17 @@ +using Content.Shared.Silicons.Laws.Components; +using Robust.Shared.Containers; + +namespace Content.Shared.Silicons.Laws; + +public abstract partial class SharedSiliconLawSystem +{ + private void InitializeUpdater() + { + SubscribeLocalEvent(OnUpdaterInsert); + } + + protected virtual void OnUpdaterInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + // TODO: Prediction + } +} diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs index c0619e6e43d..a30e7c8980f 100644 --- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs +++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs @@ -8,13 +8,14 @@ namespace Content.Shared.Silicons.Laws; /// /// This handles getting and displaying the laws for silicons. /// -public abstract class SharedSiliconLawSystem : EntitySystem +public abstract partial class SharedSiliconLawSystem : EntitySystem { [Dependency] private readonly SharedPopupSystem _popup = default!; /// public override void Initialize() { + InitializeUpdater(); SubscribeLocalEvent(OnGotEmagged); SubscribeLocalEvent(OnAttemptEmag); } diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs new file mode 100644 index 00000000000..ff6fc1ece07 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs @@ -0,0 +1,25 @@ +using Content.Shared.Doors.Components; +using Robust.Shared.Serialization; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem +{ + // Handles airlock radial + + private void InitializeAirlock() + { + SubscribeLocalEvent(OnAirlockBolt); + } + + private void OnAirlockBolt(EntityUid ent, DoorBoltComponent component, StationAiBoltEvent args) + { + _doors.SetBoltsDown((ent, component), args.Bolted, args.User, predicted: true); + } +} + +[Serializable, NetSerializable] +public sealed class StationAiBoltEvent : BaseStationAiAction +{ + public bool Bolted; +} diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs new file mode 100644 index 00000000000..a6c57f59400 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs @@ -0,0 +1,187 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Actions.Events; +using Content.Shared.Interaction.Events; +using Content.Shared.Verbs; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem +{ + /* + * Added when an entity is inserted into a StationAiCore. + */ + + private void InitializeHeld() + { + SubscribeLocalEvent(OnRadialMessage); + SubscribeLocalEvent(OnMessageAttempt); + SubscribeLocalEvent>(OnTargetVerbs); + + SubscribeLocalEvent(OnHeldInteraction); + SubscribeLocalEvent(OnHeldRelay); + SubscribeLocalEvent(OnCoreJump); + } + + private void OnCoreJump(Entity ent, ref JumpToCoreEvent args) + { + if (!TryGetCore(ent.Owner, out var core) || core.Comp?.RemoteEntity == null) + return; + + _xforms.DropNextTo(core.Comp.RemoteEntity.Value, core.Owner) ; + } + + /// + /// Tries to get the entity held in the AI core. + /// + private bool TryGetHeld(Entity entity, out EntityUid held) + { + held = EntityUid.Invalid; + + if (!Resolve(entity.Owner, ref entity.Comp)) + return false; + + if (!_containers.TryGetContainer(entity.Owner, StationAiCoreComponent.Container, out var container) || + container.ContainedEntities.Count == 0) + return false; + + held = container.ContainedEntities[0]; + return true; + } + + private bool TryGetCore(EntityUid ent, out Entity core) + { + if (!_containers.TryGetContainingContainer(ent, out var container) || + container.ID != StationAiCoreComponent.Container || + !TryComp(container.Owner, out StationAiCoreComponent? coreComp) || + coreComp.RemoteEntity == null) + { + core = (EntityUid.Invalid, null); + return false; + } + + core = (container.Owner, coreComp); + return true; + } + + private void OnHeldRelay(Entity ent, ref AttemptRelayActionComponentChangeEvent args) + { + if (!TryGetCore(ent.Owner, out var core)) + return; + + args.Target = core.Comp?.RemoteEntity; + } + + private void OnRadialMessage(StationAiRadialMessage ev) + { + if (!TryGetEntity(ev.Entity, out var target)) + return; + + ev.Event.User = ev.Actor; + RaiseLocalEvent(target.Value, (object) ev.Event); + } + + private void OnMessageAttempt(BoundUserInterfaceMessageAttempt ev) + { + if (ev.Actor == ev.Target) + return; + + if (TryComp(ev.Actor, out StationAiHeldComponent? aiComp) && + (!ValidateAi((ev.Actor, aiComp)) || + !HasComp(ev.Target))) + { + ev.Cancel(); + } + } + + private void OnHeldInteraction(Entity ent, ref InteractionAttemptEvent args) + { + // Cancel if it's not us or something with a whitelist. + args.Cancelled = ent.Owner != args.Target && + args.Target != null && + (!TryComp(args.Target, out StationAiWhitelistComponent? whitelist) || !whitelist.Enabled); + } + + private void OnTargetVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanComplexInteract || + !ent.Comp.Enabled || + !HasComp(args.User) || + !HasComp(args.Target)) + { + return; + } + + var user = args.User; + var target = args.Target; + + var isOpen = _uiSystem.IsUiOpen(target, AiUi.Key, user); + + args.Verbs.Add(new AlternativeVerb() + { + Text = isOpen ? Loc.GetString("ai-close") : Loc.GetString("ai-open"), + Act = () => + { + if (isOpen) + { + _uiSystem.CloseUi(ent.Owner, AiUi.Key, user); + } + else + { + _uiSystem.OpenUi(ent.Owner, AiUi.Key, user); + } + } + }); + } +} + +/// +/// Raised from client to server as a BUI message wrapping the event to perform. +/// Also handles AI action validation. +/// +[Serializable, NetSerializable] +public sealed class StationAiRadialMessage : BoundUserInterfaceMessage +{ + public BaseStationAiAction Event = default!; +} + +// Do nothing on server just here for shared move along. +/// +/// Raised on client to get the relevant data for radial actions. +/// +public sealed class StationAiRadial : BaseStationAiAction +{ + public SpriteSpecifier? Sprite; + + public string? Tooltip; + + public BaseStationAiAction Event = default!; +} + +/// +/// Abstract parent for radial actions events. +/// When a client requests a radial action this will get sent. +/// +[Serializable, NetSerializable] +public abstract class BaseStationAiAction +{ + [field:NonSerialized] + public EntityUid User { get; set; } +} + +// No idea if there's a better way to do this. +/// +/// Grab actions possible for an AI on the target entity. +/// +[ByRefEvent] +public record struct GetStationAiRadialEvent() +{ + public List Actions = new(); +} + +[Serializable, NetSerializable] +public enum AiUi : byte +{ + Key, +} diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs new file mode 100644 index 00000000000..bc2e3665f58 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs @@ -0,0 +1,28 @@ +using Content.Shared.Light.Components; +using Robust.Shared.Serialization; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem +{ + // Handles light toggling. + + private void InitializeLight() + { + SubscribeLocalEvent(OnLight); + } + + private void OnLight(EntityUid ent, ItemTogglePointLightComponent component, StationAiLightEvent args) + { + if (args.Enabled) + _toggles.TryActivate(ent, user: args.User); + else + _toggles.TryDeactivate(ent, user: args.User); + } +} + +[Serializable, NetSerializable] +public sealed class StationAiLightEvent : BaseStationAiAction +{ + public bool Enabled; +} diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs new file mode 100644 index 00000000000..348b0b04657 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs @@ -0,0 +1,412 @@ +using Content.Shared.ActionBlocker; +using Content.Shared.Actions; +using Content.Shared.Administration.Managers; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Database; +using Content.Shared.Doors.Systems; +using Content.Shared.Interaction; +using Content.Shared.Item.ItemToggle; +using Content.Shared.Mind; +using Content.Shared.Movement.Components; +using Content.Shared.Movement.Systems; +using Content.Shared.Power; +using Content.Shared.StationAi; +using Content.Shared.Verbs; +using Robust.Shared.Containers; +using Robust.Shared.Map.Components; +using Robust.Shared.Network; +using Robust.Shared.Physics; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Timing; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem : EntitySystem +{ + [Dependency] private readonly ISharedAdminManager _admin = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly ItemSlotsSystem _slots = default!; + [Dependency] private readonly ItemToggleSystem _toggles = default!; + [Dependency] private readonly ActionBlockerSystem _blocker = default!; + [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedContainerSystem _containers = default!; + [Dependency] private readonly SharedDoorSystem _doors = default!; + [Dependency] private readonly SharedEyeSystem _eye = default!; + [Dependency] protected readonly SharedMapSystem Maps = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedMoverController _mover = default!; + [Dependency] private readonly SharedTransformSystem _xforms = default!; + [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private readonly StationAiVisionSystem _vision = default!; + + // StationAiHeld is added to anything inside of an AI core. + // StationAiHolder indicates it can hold an AI positronic brain (e.g. holocard / core). + // StationAiCore holds functionality related to the core itself. + // StationAiWhitelist is a general whitelist to stop it being able to interact with anything + // StationAiOverlay handles the static overlay. It also handles interaction blocking on client and server + // for anything under it. + + private EntityQuery _broadphaseQuery; + private EntityQuery _gridQuery; + + [ValidatePrototypeId] + private static readonly EntProtoId DefaultAi = "StationAiBrain"; + + public override void Initialize() + { + base.Initialize(); + + _broadphaseQuery = GetEntityQuery(); + _gridQuery = GetEntityQuery(); + + InitializeAirlock(); + InitializeHeld(); + InitializeLight(); + + SubscribeLocalEvent(OnAiBuiCheck); + + SubscribeLocalEvent(OnAiAccessible); + SubscribeLocalEvent(OnAiInRange); + SubscribeLocalEvent(OnAiMenu); + + SubscribeLocalEvent(OnHolderInit); + SubscribeLocalEvent(OnHolderRemove); + SubscribeLocalEvent(OnHolderInteract); + SubscribeLocalEvent(OnHolderMapInit); + SubscribeLocalEvent(OnHolderConInsert); + SubscribeLocalEvent(OnHolderConRemove); + + SubscribeLocalEvent(OnAiInsert); + SubscribeLocalEvent(OnAiRemove); + SubscribeLocalEvent(OnAiMapInit); + SubscribeLocalEvent(OnAiShutdown); + SubscribeLocalEvent(OnCorePower); + SubscribeLocalEvent>(OnCoreVerbs); + } + + private void OnCoreVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!_admin.IsAdmin(args.User) || + TryGetHeld((ent.Owner, ent.Comp), out _)) + { + return; + } + + var user = args.User; + + args.Verbs.Add(new Verb() + { + Text = Loc.GetString("station-ai-takeover"), + Category = VerbCategory.Debug, + Act = () => + { + var brain = SpawnInContainerOrDrop(DefaultAi, ent.Owner, StationAiCoreComponent.Container); + _mind.ControlMob(user, brain); + }, + Impact = LogImpact.High, + }); + } + + private void OnAiAccessible(Entity ent, ref AccessibleOverrideEvent args) + { + args.Handled = true; + + // Hopefully AI never needs storage + if (_containers.TryGetContainingContainer(args.Target, out var targetContainer)) + { + return; + } + + if (!_containers.IsInSameOrTransparentContainer(args.User, args.Target, otherContainer: targetContainer)) + { + return; + } + + args.Accessible = true; + } + + private void OnAiMenu(Entity ent, ref MenuVisibilityEvent args) + { + args.Visibility &= ~MenuVisibility.NoFov; + } + + private void OnAiBuiCheck(Entity ent, ref BoundUserInterfaceCheckRangeEvent args) + { + args.Result = BoundUserInterfaceRangeResult.Fail; + + // Similar to the inrange check but more optimised so server doesn't die. + var targetXform = Transform(args.Target); + + // No cross-grid + if (targetXform.GridUid != args.Actor.Comp.GridUid) + { + return; + } + + if (!_broadphaseQuery.TryComp(targetXform.GridUid, out var broadphase) || !_gridQuery.TryComp(targetXform.GridUid, out var grid)) + { + return; + } + + var targetTile = Maps.LocalToTile(targetXform.GridUid.Value, grid, targetXform.Coordinates); + + lock (_vision) + { + if (_vision.IsAccessible((targetXform.GridUid.Value, broadphase, grid), targetTile, fastPath: true)) + { + args.Result = BoundUserInterfaceRangeResult.Pass; + } + } + } + + private void OnAiInRange(Entity ent, ref InRangeOverrideEvent args) + { + args.Handled = true; + var targetXform = Transform(args.Target); + + // No cross-grid + if (targetXform.GridUid != Transform(args.User).GridUid) + { + return; + } + + // Validate it's in camera range yes this is expensive. + // Yes it needs optimising + if (!_broadphaseQuery.TryComp(targetXform.GridUid, out var broadphase) || !_gridQuery.TryComp(targetXform.GridUid, out var grid)) + { + return; + } + + var targetTile = Maps.LocalToTile(targetXform.GridUid.Value, grid, targetXform.Coordinates); + + args.InRange = _vision.IsAccessible((targetXform.GridUid.Value, broadphase, grid), targetTile); + } + + private void OnHolderInteract(Entity ent, ref AfterInteractEvent args) + { + if (!TryComp(args.Target, out StationAiHolderComponent? targetHolder)) + return; + + // Try to insert our thing into them + if (_slots.CanEject(ent.Owner, args.User, ent.Comp.Slot)) + { + if (!_slots.TryInsert(args.Target.Value, targetHolder.Slot, ent.Comp.Slot.Item!.Value, args.User, excludeUserAudio: true)) + { + return; + } + + args.Handled = true; + return; + } + + // Otherwise try to take from them + if (_slots.CanEject(args.Target.Value, args.User, targetHolder.Slot)) + { + if (!_slots.TryInsert(ent.Owner, ent.Comp.Slot, targetHolder.Slot.Item!.Value, args.User, excludeUserAudio: true)) + { + return; + } + + args.Handled = true; + } + } + + private void OnHolderInit(Entity ent, ref ComponentInit args) + { + _slots.AddItemSlot(ent.Owner, StationAiHolderComponent.Container, ent.Comp.Slot); + } + + private void OnHolderRemove(Entity ent, ref ComponentRemove args) + { + _slots.RemoveItemSlot(ent.Owner, ent.Comp.Slot); + } + + private void OnHolderConInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + UpdateAppearance((ent.Owner, ent.Comp)); + } + + private void OnHolderConRemove(Entity ent, ref EntRemovedFromContainerMessage args) + { + UpdateAppearance((ent.Owner, ent.Comp)); + } + + private void OnHolderMapInit(Entity ent, ref MapInitEvent args) + { + UpdateAppearance(ent.Owner); + } + + private void OnAiShutdown(Entity ent, ref ComponentShutdown args) + { + // TODO: Tryqueuedel + if (_net.IsClient) + return; + + QueueDel(ent.Comp.RemoteEntity); + ent.Comp.RemoteEntity = null; + } + + private void OnCorePower(Entity ent, ref PowerChangedEvent args) + { + // TODO: I think in 13 they just straightup die so maybe implement that + if (args.Powered) + { + if (!SetupEye(ent)) + return; + + AttachEye(ent); + } + else + { + ClearEye(ent); + } + } + + private void OnAiMapInit(Entity ent, ref MapInitEvent args) + { + SetupEye(ent); + AttachEye(ent); + } + + private bool SetupEye(Entity ent) + { + if (ent.Comp.RemoteEntity != null) + return false; + + if (ent.Comp.RemoteEntityProto != null) + { + ent.Comp.RemoteEntity = SpawnAtPosition(ent.Comp.RemoteEntityProto, Transform(ent.Owner).Coordinates); + Dirty(ent); + } + + return true; + } + + private void ClearEye(Entity ent) + { + QueueDel(ent.Comp.RemoteEntity); + ent.Comp.RemoteEntity = null; + } + + private void AttachEye(Entity ent) + { + if (ent.Comp.RemoteEntity == null) + return; + + if (!_containers.TryGetContainer(ent.Owner, StationAiHolderComponent.Container, out var container) || + container.ContainedEntities.Count != 1) + { + return; + } + + // Attach them to the portable eye that can move around. + var user = container.ContainedEntities[0]; + + if (TryComp(user, out EyeComponent? eyeComp)) + { + _eye.SetTarget(user, ent.Comp.RemoteEntity.Value, eyeComp); + } + + _mover.SetRelay(user, ent.Comp.RemoteEntity.Value); + } + + private void OnAiInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + if (_timing.ApplyingState) + return; + + // Just so text and the likes works properly + _metadata.SetEntityName(ent.Owner, MetaData(args.Entity).EntityName); + + AttachEye(ent); + } + + private void OnAiRemove(Entity ent, ref EntRemovedFromContainerMessage args) + { + if (_timing.ApplyingState) + return; + + // Reset name to whatever + _metadata.SetEntityName(ent.Owner, Prototype(ent.Owner)?.Name ?? string.Empty); + + // Remove eye relay + RemCompDeferred(args.Entity); + + if (TryComp(args.Entity, out EyeComponent? eyeComp)) + { + _eye.SetTarget(args.Entity, null, eyeComp); + } + } + + private void UpdateAppearance(Entity entity) + { + if (!Resolve(entity.Owner, ref entity.Comp, false)) + return; + + if (!_containers.TryGetContainer(entity.Owner, StationAiHolderComponent.Container, out var container) || + container.Count == 0) + { + _appearance.SetData(entity.Owner, StationAiVisualState.Key, StationAiState.Empty); + return; + } + + _appearance.SetData(entity.Owner, StationAiVisualState.Key, StationAiState.Occupied); + } + + public virtual bool SetVisionEnabled(Entity entity, bool enabled, bool announce = false) + { + if (entity.Comp.Enabled == enabled) + return false; + + entity.Comp.Enabled = enabled; + Dirty(entity); + + return true; + } + + public virtual bool SetWhitelistEnabled(Entity entity, bool value, bool announce = false) + { + if (entity.Comp.Enabled == value) + return false; + + entity.Comp.Enabled = value; + Dirty(entity); + + return true; + } + + /// + /// BUI validation for ai interactions. + /// + private bool ValidateAi(Entity entity) + { + if (!Resolve(entity.Owner, ref entity.Comp, false)) + { + return false; + } + + return _blocker.CanComplexInteract(entity.Owner); + } +} + +public sealed partial class JumpToCoreEvent : InstantActionEvent +{ + +} + +[Serializable, NetSerializable] +public enum StationAiVisualState : byte +{ + Key, +} + +[Serializable, NetSerializable] +public enum StationAiState : byte +{ + Empty, + Occupied, + Dead, +} diff --git a/Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs b/Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs new file mode 100644 index 00000000000..b7a8b4cd5fa --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs @@ -0,0 +1,32 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Indicates this entity can interact with station equipment and is a "Station AI". +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class StationAiCoreComponent : Component +{ + /* + * I couldn't think of any other reason you'd want to split these out. + */ + + /// + /// Can it move its camera around and interact remotely with things. + /// + [DataField, AutoNetworkedField] + public bool Remote = true; + + /// + /// The invisible eye entity being used to look around. + /// + [DataField, AutoNetworkedField] + public EntityUid? RemoteEntity; + + [DataField(readOnly: true)] + public EntProtoId? RemoteEntityProto = "StationAiHolo"; + + public const string Container = "station_ai_mind_slot"; +} diff --git a/Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs b/Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs new file mode 100644 index 00000000000..6dab1ee491a --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Indicates this entity is currently held inside of a station AI core. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class StationAiHeldComponent : Component; diff --git a/Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs b/Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs new file mode 100644 index 00000000000..221845d493d --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs @@ -0,0 +1,16 @@ +using Content.Shared.Containers.ItemSlots; +using Robust.Shared.GameStates; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Allows moving a contained entity to and from this component. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class StationAiHolderComponent : Component +{ + public const string Container = StationAiCoreComponent.Container; + + [DataField] + public ItemSlot Slot = new(); +} diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs b/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs index 94aef8ad366..f047fe41e4d 100644 --- a/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs +++ b/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs @@ -1,8 +1,9 @@ +using Content.Shared.Silicons.StationAi; using Robust.Shared.GameStates; -namespace Content.Shared.Silicons.StationAi; +namespace Content.Shared.StationAi; -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]//, Access(typeof(SharedStationAiSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationAiSystem))] public sealed partial class StationAiVisionComponent : Component { [DataField, AutoNetworkedField] diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs index c144f330e11..bdc62a6bb37 100644 --- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs +++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs @@ -1,4 +1,6 @@ +using Content.Shared.StationAi; using Robust.Shared.Map.Components; +using Robust.Shared.Physics; using Robust.Shared.Threading; using Robust.Shared.Utility; @@ -24,6 +26,8 @@ public sealed class StationAiVisionSystem : EntitySystem private readonly HashSet> _seeds = new(); private readonly HashSet _viewportTiles = new(); + private EntityQuery _occluderQuery; + // Dummy set private readonly HashSet _singleTiles = new(); @@ -36,15 +40,12 @@ public sealed class StationAiVisionSystem : EntitySystem /// private bool FastPath; - /// - /// Have we found the target tile if we're only checking for a single one. - /// - private bool TargetFound; - public override void Initialize() { base.Initialize(); + _occluderQuery = GetEntityQuery(); + _seedJob = new() { System = this, @@ -61,16 +62,16 @@ public override void Initialize() /// /// Returns whether a tile is accessible based on vision. /// - public bool IsAccessible(Entity grid, Vector2i tile, float expansionSize = 8.5f, bool fastPath = false) + public bool IsAccessible(Entity grid, Vector2i tile, float expansionSize = 8.5f, bool fastPath = false) { _viewportTiles.Clear(); _opaque.Clear(); _seeds.Clear(); _viewportTiles.Add(tile); - var localBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize); + var localBounds = _lookup.GetLocalBounds(tile, grid.Comp2.TileSize); var expandedBounds = localBounds.Enlarged(expansionSize); - _seedJob.Grid = grid; + _seedJob.Grid = (grid.Owner, grid.Comp2); _seedJob.ExpandedBounds = expandedBounds; _parallel.ProcessNow(_seedJob); _job.Data.Clear(); @@ -110,21 +111,19 @@ public bool IsAccessible(Entity grid, Vector2i tile, float exp _job.BoundaryTiles.Add(new HashSet()); } - _job.TargetTile = tile; - TargetFound = false; _singleTiles.Clear(); - _job.Grid = grid; + _job.Grid = (grid.Owner, grid.Comp2); _job.VisibleTiles = _singleTiles; _parallel.ProcessNow(_job, _job.Data.Count); - return TargetFound; + return _job.VisibleTiles.Contains(tile); } - private bool IsOccluded(Entity grid, Vector2i tile) + private bool IsOccluded(Entity grid, Vector2i tile) { - var tileBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize).Enlarged(-0.05f); + var tileBounds = _lookup.GetLocalBounds(tile, grid.Comp2.TileSize).Enlarged(-0.05f); _occluders.Clear(); - _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static); + _lookup.GetLocalEntitiesIntersecting((grid.Owner, grid.Comp1), tileBounds, _occluders, query: _occluderQuery, flags: LookupFlags.Static | LookupFlags.Approximate); var anyOccluders = false; foreach (var occluder in _occluders) @@ -143,17 +142,18 @@ private bool IsOccluded(Entity grid, Vector2i tile) /// Gets a byond-equivalent for tiles in the specified worldAABB. /// /// How much to expand the bounds before to find vision intersecting it. Makes this the largest vision size + 1 tile. - public void GetView(Entity grid, Box2Rotated worldBounds, HashSet visibleTiles, float expansionSize = 8.5f) + public void GetView(Entity grid, Box2Rotated worldBounds, HashSet visibleTiles, float expansionSize = 8.5f) { _viewportTiles.Clear(); _opaque.Clear(); _seeds.Clear(); - var expandedBounds = worldBounds.Enlarged(expansionSize); // TODO: Would be nice to be able to run this while running the other stuff. - _seedJob.Grid = grid; - var localAABB = _xforms.GetInvWorldMatrix(grid).TransformBox(expandedBounds); - _seedJob.ExpandedBounds = localAABB; + _seedJob.Grid = (grid.Owner, grid.Comp2); + var invMatrix = _xforms.GetInvWorldMatrix(grid); + var localAabb = invMatrix.TransformBox(worldBounds); + var enlargedLocalAabb = invMatrix.TransformBox(worldBounds.Enlarged(expansionSize)); + _seedJob.ExpandedBounds = enlargedLocalAabb; _parallel.ProcessNow(_seedJob); _job.Data.Clear(); FastPath = false; @@ -170,7 +170,7 @@ public void GetView(Entity grid, Box2Rotated worldBounds, Hash return; // Get viewport tiles - var tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAABB, ignoreEmpty: false); + var tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAabb, ignoreEmpty: false); while (tileEnumerator.MoveNext(out var tileRef)) { @@ -182,9 +182,8 @@ public void GetView(Entity grid, Box2Rotated worldBounds, Hash _viewportTiles.Add(tileRef.GridIndices); } - tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAABB, ignoreEmpty: false); + tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, enlargedLocalAabb, ignoreEmpty: false); - // Get all other relevant tiles. while (tileEnumerator.MoveNext(out var tileRef)) { if (_viewportTiles.Contains(tileRef.GridIndices)) @@ -206,9 +205,7 @@ public void GetView(Entity grid, Box2Rotated worldBounds, Hash _job.BoundaryTiles.Add(new HashSet()); } - _job.TargetTile = null; - TargetFound = false; - _job.Grid = grid; + _job.Grid = (grid.Owner, grid.Comp2); _job.VisibleTiles = visibleTiles; _parallel.ProcessNow(_job, _job.Data.Count); } @@ -250,6 +247,7 @@ private bool CheckNeighborsVis( return false; } + /// /// Checks whether this tile fits the definition of a "corner" /// private bool IsCorner( @@ -287,7 +285,7 @@ private record struct SeedJob() : IRobustJob public void Execute() { - System._lookup.GetLocalEntitiesIntersecting(Grid.Owner, ExpandedBounds, System._seeds); + System._lookup.GetLocalEntitiesIntersecting(Grid.Owner, ExpandedBounds, System._seeds, flags: LookupFlags.All | LookupFlags.Approximate); } } @@ -302,9 +300,6 @@ private record struct ViewJob() : IParallelRobustJob public Entity Grid; public List> Data = new(); - // If we're doing range-checks might be able to early out - public Vector2i? TargetTile; - public HashSet VisibleTiles; public readonly List> Vis1 = new(); @@ -315,18 +310,6 @@ private record struct ViewJob() : IParallelRobustJob public void Execute(int index) { - // If we're looking for a single tile then early-out if someone else has found it. - if (TargetTile != null) - { - lock (System) - { - if (System.TargetFound) - { - return; - } - } - } - var seed = Data[index]; var seedXform = EntManager.GetComponent(seed); @@ -338,30 +321,11 @@ public void Execute(int index) Grid.Comp, new Circle(System._xforms.GetWorldPosition(seedXform), seed.Comp.Range), ignoreEmpty: false); - // Try to find the target tile. - if (TargetTile != null) + lock (VisibleTiles) { foreach (var tile in squircles) { - if (tile.GridIndices == TargetTile) - { - lock (System) - { - System.TargetFound = true; - } - - return; - } - } - } - else - { - lock (VisibleTiles) - { - foreach (var tile in squircles) - { - VisibleTiles.Add(tile.GridIndices); - } + VisibleTiles.Add(tile.GridIndices); } } @@ -480,40 +444,21 @@ public void Execute(int index) vis1[tile] = -1; } - if (TargetTile != null) - { - if (vis1.TryGetValue(TargetTile.Value, out var tileVis)) - { - DebugTools.Assert(seedTiles.Contains(TargetTile.Value)); - - if (tileVis != 0) - { - lock (System) - { - System.TargetFound = true; - return; - } - } - } - } - else + // vis2 is what we care about for LOS. + foreach (var tile in seedTiles) { - // vis2 is what we care about for LOS. - foreach (var tile in seedTiles) - { - // If not in viewport don't care. - if (!System._viewportTiles.Contains(tile)) - continue; + // If not in viewport don't care. + if (!System._viewportTiles.Contains(tile)) + continue; - var tileVis = vis1.GetValueOrDefault(tile, 0); + var tileVis = vis1.GetValueOrDefault(tile, 0); - if (tileVis != 0) + if (tileVis != 0) + { + // No idea if it's better to do this inside or out. + lock (VisibleTiles) { - // No idea if it's better to do this inside or out. - lock (VisibleTiles) - { - VisibleTiles.Add(tile); - } + VisibleTiles.Add(tile); } } } diff --git a/Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs b/Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs new file mode 100644 index 00000000000..51d8793be06 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Indicates an entity that has can interact with this. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationAiSystem))] +public sealed partial class StationAiWhitelistComponent : Component +{ + [DataField, AutoNetworkedField] + public bool Enabled = true; +} diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index 4a2ad625af9..dedfd7bd009 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -8,12 +8,15 @@ using Content.Shared.Storage.EntitySystems; using Robust.Shared.Collections; using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Utility; namespace Content.Shared.Station; public abstract class SharedStationSpawningSystem : EntitySystem { [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; + [Dependency] private readonly IRobustRandom _random = default!; [Dependency] protected readonly InventorySystem InventorySystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedStorageSystem _storage = default!; diff --git a/Content.Shared/UserInterface/ActivatableUIComponent.cs b/Content.Shared/UserInterface/ActivatableUIComponent.cs index 30c07637420..b148cb8bce0 100644 --- a/Content.Shared/UserInterface/ActivatableUIComponent.cs +++ b/Content.Shared/UserInterface/ActivatableUIComponent.cs @@ -12,7 +12,7 @@ public sealed partial class ActivatableUIComponent : Component /// /// Whether the item must be held in one of the user's hands to work. - /// This is ignored unless is true. + /// This is ignored unless is true. /// [ViewVariables(VVAccess.ReadWrite)] [DataField] @@ -29,15 +29,15 @@ public sealed partial class ActivatableUIComponent : Component public LocId VerbText = "ui-verb-toggle-open"; /// - /// Whether you need a hand to operate this UI. The hand does not need to be free, you just need to have one. + /// Whether you need to be able to do complex interactions to operate this UI. /// /// /// This should probably be true for most machines & computers, but there will still be UIs that represent a - /// more generic interaction / configuration that might not require hands. + /// more generic interaction / configuration that might not require complex. /// [ViewVariables(VVAccess.ReadWrite)] [DataField] - public bool RequireHands = true; + public bool RequiresComplex = true; /// /// Entities that are required to open this UI. diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs index f32d6c98a89..c3e4c619237 100644 --- a/Content.Shared/UserInterface/ActivatableUISystem.cs +++ b/Content.Shared/UserInterface/ActivatableUISystem.cs @@ -105,7 +105,7 @@ private bool ShouldAddVerb(EntityUid uid, ActivatableUIComponent component, G || _whitelistSystem.IsWhitelistFail(component.UserWhitelist, args.User)) return false; - if (component.RequireHands) + if (component.RequiresComplex) { if (args.Hands == null) return false; @@ -193,19 +193,22 @@ private bool InteractUI(EntityUid user, EntityUid uiEntity, ActivatableUICompone if (!_blockerSystem.CanInteract(user, uiEntity) && (!HasComp(user) || aui.BlockSpectators)) return false; - if (aui.RequireHands) + if (aui.RequiresComplex) + { + if (!_blockerSystem.CanComplexInteract(user)) + return false; + } + + if (aui.InHandsOnly) { if (!TryComp(user, out HandsComponent? hands)) return false; - if (aui.InHandsOnly) - { - if (!_hands.IsHolding(user, uiEntity, out var hand, hands)) - return false; + if (!_hands.IsHolding(user, uiEntity, out var hand, hands)) + return false; - if (aui.RequireActiveHand && hands.ActiveHand != hand) - return false; - } + if (aui.RequireActiveHand && hands.ActiveHand != hand) + return false; } if (aui.AdminOnly && !_adminManager.IsAdmin(user)) @@ -276,13 +279,13 @@ public void CloseAll(EntityUid uid, ActivatableUIComponent? aui = null) private void OnHandDeselected(Entity ent, ref HandDeselectedEvent args) { - if (ent.Comp.RequireHands && ent.Comp.InHandsOnly && ent.Comp.RequireActiveHand) + if (ent.Comp.InHandsOnly && ent.Comp.RequireActiveHand) CloseAll(ent, ent); } private void OnHandUnequipped(Entity ent, ref GotUnequippedHandEvent args) { - if (ent.Comp.RequireHands && ent.Comp.InHandsOnly) + if (ent.Comp.InHandsOnly) CloseAll(ent, ent); } } diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index 319f927c7b3..c3f906f2936 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -77,6 +77,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, out var hands); @@ -84,7 +85,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } @@ -93,35 +94,35 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(@using.Value, verbEvent, true); // directed at used, not at target verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(InnateVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(user, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(AlternativeVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(ActivationVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(ExamineVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } @@ -129,7 +130,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } @@ -137,7 +138,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, access, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent); verbs.UnionWith(verbEvent.Verbs); } diff --git a/Content.Shared/Verbs/VerbEvents.cs b/Content.Shared/Verbs/VerbEvents.cs index 6b3fd327c99..6bca97925bf 100644 --- a/Content.Shared/Verbs/VerbEvents.cs +++ b/Content.Shared/Verbs/VerbEvents.cs @@ -113,6 +113,11 @@ public sealed class GetVerbsEvent : EntityEventArgs where TVerb : Verb /// public readonly bool CanInteract; + /// + /// Cached version of CanComplexInteract + /// + public readonly bool CanComplexInteract; + /// /// The User's hand component. /// @@ -130,13 +135,14 @@ public sealed class GetVerbsEvent : EntityEventArgs where TVerb : Verb /// public readonly EntityUid? Using; - public GetVerbsEvent(EntityUid user, EntityUid target, EntityUid? @using, HandsComponent? hands, bool canInteract, bool canAccess, List extraCategories) + public GetVerbsEvent(EntityUid user, EntityUid target, EntityUid? @using, HandsComponent? hands, bool canInteract, bool canComplexInteract, bool canAccess, List extraCategories) { User = user; Target = target; Using = @using; Hands = hands; CanAccess = canAccess; + CanComplexInteract = canComplexInteract; CanInteract = canInteract; ExtraCategories = extraCategories; } diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs index 24f3ad8e764..7ef2230e7a0 100644 --- a/Content.Shared/Wires/SharedWiresSystem.cs +++ b/Content.Shared/Wires/SharedWiresSystem.cs @@ -125,11 +125,20 @@ public bool CanTogglePanel(Entity ent, EntityUid? user) return !attempt.Cancelled; } - public bool IsPanelOpen(Entity entity) + public bool IsPanelOpen(Entity entity, EntityUid? tool = null) { if (!Resolve(entity, ref entity.Comp, false)) return true; + if (tool != null) + { + var ev = new PanelOverrideEvent(); + RaiseLocalEvent(tool.Value, ref ev); + + if (ev.Allowed) + return true; + } + // Listen, i don't know what the fuck this component does. it's stapled on shit for airlocks // but it looks like an almost direct duplication of WiresPanelComponent except with a shittier API. if (TryComp(entity, out var wiresPanelSecurity) && @@ -139,3 +148,12 @@ public bool IsPanelOpen(Entity entity) return entity.Comp.Open; } } + +/// +/// Raised directed on a tool to try and override panel visibility. +/// +[ByRefEvent] +public record struct PanelOverrideEvent() +{ + public bool Allowed = true; +} diff --git a/Resources/Audio/Effects/Footsteps/attributions.yml b/Resources/Audio/Effects/Footsteps/attributions.yml index 91c3ce260d4..7a56beec38c 100644 --- a/Resources/Audio/Effects/Footsteps/attributions.yml +++ b/Resources/Audio/Effects/Footsteps/attributions.yml @@ -76,5 +76,5 @@ - borgwalk1.ogg - borgwalk2.ogg license: "CC-BY-SA-4.0" - copyright: "Taken from IENBA freesound.org and modified by https://github.com/MilenVolf" + copyright: "Taken from IENBA freesound.org and modified by https://github.com/MilenVolf. borgwalk2 clipped my metalgearsloth." source: "https://freesound.org/people/IENBA/sounds/697379/" diff --git a/Resources/Audio/Effects/Footsteps/borgwalk2.ogg b/Resources/Audio/Effects/Footsteps/borgwalk2.ogg index 96c2c1617f47556ab8143e378469e314b37e6c64..57685ff173de25a873c363fe72d645db56b91201 100644 GIT binary patch delta 7656 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 C>tw$G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Actions/actions_ai.rsi/crew_monitor.png b/Resources/Textures/Interface/Actions/actions_ai.rsi/crew_monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..78fad17a76c58ceb3ff7bdc60107aaf01f477511 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*8>L*7#kY{c?^7#3{tub z^?VEl2@ER)7@X@Fin!ewG6EP%!x`!s%+eT);%<0z0EYlhP7Ws4mY#_XN*)JTIW?R@TH4yAq-QTZ7`mfv`t-IPJGLGS zoiT0tbav_4TNOj5OlxmnvUKaxr3$N0ym;}#qir>ZYq(%n8rv>iiFXG|R&Lz5bmPZW zM^9*_`4xVQYg%*Y%8efeU0mVf@*&1Pz5I*Y+E??>(p}cxn>#VIVoO=c7dywW!YdM? otQW*gj6bwlxw#~|s46lrY*UY|zO-x71(07oUHx3vIVCg!0LmC=oB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Actions/actions_ai.rsi/manifest.png b/Resources/Textures/Interface/Actions/actions_ai.rsi/manifest.png new file mode 100644 index 0000000000000000000000000000000000000000..08514aa90829c59d8d3995ba7f1a5f0ad5c24bd2 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*8>L*7#kY{c?^7#3{tub z1_=xaoDB7R49@io?Ys;H+zcxO7)&x4Y^x@eT{8nJV=M{s3ubV5b|VeQsq}Pl4AGdF zoS?uX!8);lA;2MklaqsqwWVibgObMqR!)r|U)PL`jEKrgtqDyl3f{hWkul$LGm}Sa z1FMf9)4>4IP|*ynu=Ou?R&Lw1NOn8d0?Fd@VL9s?Rv*}~boZ`r=jPsiYF)6}p}3v< m(8~}WekUyhB`#$xPDX~VR|VGL*7#kY{c?^7#3{tub z1_=!Hd<@R@47ODaD+Ih}3GV|+F_r}R1v5B2yO9RuG zc;9e29;_CzYIva3R9#VYJBwe{?Sk|FgNL6h9?Q9HwOhe5OHofKuv^$8MSH{1ed?$D zD;RuRdtb!u}jolMn|I`RMAi9i1D j9cS27zTB`Paq4Ot3*m6NwGaI|K(6+5^>bP0l+XkKP^uEd4~`UkiU=&WgIWMue|ZFBN9!-0c9%NRUe{an^LB{Ts5`?Wy_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 745cc43b844..117a94e790d 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip", "size": { "x": 8, @@ -177,6 +177,9 @@ [1.0,1.0] ] }, + { + "name": "StationAi" + }, { "name": "Syndicate" }, diff --git a/Resources/Textures/Interface/noise.rsi/meta.json b/Resources/Textures/Interface/noise.rsi/meta.json new file mode 100644 index 00000000000..068ecab968e --- /dev/null +++ b/Resources/Textures/Interface/noise.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/4b4e9dff1d7d891cfb75d25ca5bf5172d1c02be6/icons/hud/screen_gen.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "noise", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Interface/noise.rsi/noise.png b/Resources/Textures/Interface/noise.rsi/noise.png new file mode 100644 index 0000000000000000000000000000000000000000..ba74952b409b6d3673c9949e6a81c0a84ecd472c GIT binary patch literal 45602 zcmW(+1z3~s7hS*@FdAi}k?zq5NDD}p0us_8-5}wJ(J3tgLlHzkx}b`g9J@?%6-9>9_DiaY<6951JqGu|Ky7%Yy`(qgjxxatz<{)r?!go_K z@&o{gyZ<|YY23s#06^vBGetRlzYpubj_XC|#<7Pv1y(=%DSn>a-@38tPCx6MC9`Jh zoJYGyt^>~kTJ28xFA2ZTNbG*_T>3@x+`#mCljxhvzi;mXmS=r$Hf8P*ky7hSy%}x) zHrzj~(c00TH}ukx1Z^qw#=CfZa(|cd!TR6st2^q!s<LO>FQi>liz|Fh_;(O*Uf6vf#bXS`-es&T5qp@xGx^(`UYNfG0@BWTOsKsa&Zeg zjFkCjA$4~-%240*YY*GBc>2v9&23^)w@Df)-tD(3x%8MXU~X_^^zGgCQsS=3ro`HR z!HFLwCrT|ICiuqbeBVOK1}-9_&lf5w};ql~s8!5Y^*r(Uh#qZId# z6gl=%J35Kf|9wDFoax=aO_^SH>BDIEQY$*g=KHtO_e!5t+BI%UZ9ewh(1OU^9wrt! z(Vt-OhL8R=uMoLr-ZY-ombaAD|M$8zE`!E_K+Ru4`?sTSZ;#jh*vVX9Trb^8(_i)} zC*Vmf1J`(6{RjWFZ4!$wqx{QnO?PxNsQK>$#S*#tbyGza z-(EK?Z19QQf9qRylYjfZZ8W{&Sb@TY)X%R5B$qBn#DWjP7}QMz|E)3P<^9M~`Q-op0n}fv{;Ld(1P}_UoXu)GV-uF`(8zJ z&s4Q$TaU9ly(X79bvAC>MuYZ+ZtoMAc)#koAL0Q0Pr!8!<;Mg1TmSuFhvDo}77M4} zd~*gG$IyJje108-3HNwfSu;ETK0_&$gnPTwaPpb|$y+e}nx~Fn*P|MtoNe_rfkgiy z@xy2>DWIHRtK_hQrcmxZ91;mlmO<6=^TC}Ixo)&)6_Iq2k_#)gZ6|3KbSqHh%z+o| z`4k`PZdR$cVAtZt3=LpU*4a`z zqeU+eJ^W z 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

vl0gv6N8x+z5N%Q37{ z+yaV&_(F~T$gZ-zQbC-E85d!0H-E6Lnm0y!&d=R;0 za~lM5BO9E5|ABiwsd|87-7e^XI@5iP{LtG6Ea7cC64c&LyAzlT*?!7|h9ki6_dR@& z6)8C1R-lhA&oM=$CcG**Gp+R!3)1$TW`xrV0`%yl`t@b0{vrc+oiHJl*vDyCtj2e3 zA(RnI+!WC6SXv>%8LlwCugOBjN0d$=?{zIN_>jRf@K_&6LDPJqvd`2SV3z?GoVdr5 zOxK$+4`4LsZy+qT`vU6#JhDwXRFr(Zdgiu=80q#PdLXluo>QInGg#A85Nf{k3Dqz? ziT{<$7`&L2$405?fHV?ESBo{B@L}aP)ueOZ$z#s*>c`@oxfMBkERtccM4<9#@IFDI zr<+=6^OI0<3K_=Csj`p36F~-F$23`gvYxN$fU=43R6?9}i6w>g`$8sFvBC$4r>dJF zveFobB&+MRO)u2X9F3Wv&9+8rYY6?OFP#Rrxo>rhsfp{Bwe^{6Tmr<~UZgC?&lMg~ z__d9;(S*BUUpSHe`niT)9XJZBiJ@XkO(0=G>8+b^b<}^M)U}$W8&e50NcvE^V}Z^< z_C!&x{~cR#CIQ*Q@~WD5xI1%TRbfi8)ua3Z7BG2o_uAK8c>7AfDHCw%u#%X&K3Arp z4?W8Ep>E1ddrvvR51}G-3W?Nc;RekauP@`$$yh9wSukQbus{pV{foPG(A?%F-h%LoVZ&_dk8?XAO6Dk`=NFRUy`oI;s(m1NJro ze!g5IMGA*P>-)gFPh;PJ6nCV@mU{2_gve|285HtE!+%h`ug3YdEB0Z^a1V52wzO()o@N!@WJxD|p z!yu-O3^IEn0YA=*oorHF4R`o45|#M6^BBABOUDCnd`{q3;W_As>T%Y;qU6;Sj=3-{ zGKw6rjZqV$?aU#)zPm1L-Yf}GCK_CkztQbVu8c1+dUf&c=}YVhjo4j8Yc$eiB)L&VTMfjnVybqc zpHs`LYyJ~}eAWNv;X}9os!XdryH_<^TMv&JL~3JEFT&q2tXkBGoLYz7VmfEk!0bjzF0Txxdy&+J9Zi7=DxI- zX0+&y_j7YlU8uV4H3cHR2`n;cATNPxsn=G! zWI`aJWPJQg?9L;L#`0L|$s8VcbXEZ5{56Z47Ht||d>w1Lmt|S+8>@a<;=7v2x*XaCWld*OS85CSb{7`VsWHLbAAP8UVU)Ou0a|fM$L!7qyE8-6 z@)pkk>Ro9oe1hH7>%mX^8fssY6M$W+NHRLp2@o~(VIOh+ZSAdqAcid>J6K>0(QTe$ zgks(LOX`CfpSetwySAA0^_$E6`Nogj4vk;mxBFE&mRR`nMRoH8S^eS2-?kpejBRQ<@KfM4cYJ5H9dS7B}l6keC#MQ zH}c037DFk5-&TctEb+%wKbOrA-wd{5%s>#q3V0bfy|LU{nN{G54bQ6r(byv+S#_g3 z>)g>b1EH2xbYQ?NHw;wnPlxhPBsuJTZ_+N+lOdDa;5~G&Zkp#o<^!X>#Ce8-elS2Ih{7t$Xsu}-LNomi0bRfv}N(LK@6ic zl?sE@=exw5XKg)%eRH}$OJQY1paS}5_LLT2a$bFsCyH>5I(XI3&{YI5-{j^>e@X~K zn3a8G3+rUlt_ogzPQ}>`c`oexV^dmv*ezCoEypGJJ-Ml+>p@=-qOvw3j0L9h1@R>~ zXE50oO$N2Kg7nE{20cp8e4rPtP0Q~=P13NT;~!REP?E8;Tb|Vl+93BOTzF0q2T_td zjJF2?7VL(g2Oobij(_AoIGD$-oVSTYP}V=Z!-!oXwn?PDAAbW;+6UKskXXNBj?ot9 z$oEJ8h-F^$e8uSr;!uhzN~S@_5e&&htqQ3=vQFBt{Jysb3kZE=5mnXcU*Kio{r-4n z&?`ySft0t?{ph7pVjuXI=Y1dFRx@5$ebk#qh;cyJV@c>UjebAA+~-^WxC7u zDoE_SuWZRYAP83k)^!B%ev#!IyVqgy+vL7@hi9`O9}x;YJ4Jxz@2?PG?2C+jbRPom zs2q!Lr8YiMsK=gC)n5uy%=76Gdgmg0$jZQQMWR$@c5k_>RTECjr z2^1;cMpcGuplD^gxsS+Yh|g|MEmpshYB?a-CaiM?SvCw~vJp-?DrU*sG{61xYq z&#rKV7VXL~uR7Sd8O<@DIXoIxz5UXAS+qfv5NCc0*8_3ZW8jw4k3+Q9GWYJF5)^#& zLX+eHI@tZJgBzLOaj8{VDS)RrrO{&$%Y@AmCB{B*#XpSGkDkkL8 z4b`&53vrRG$AYJVt9y@)wrRk|3r(3SY%RL!XV9t&L z8z&Y1j2-a@X-O+j`T>>G^Uw}|PQKoc9^-pO?#}#bO7g);I^=X0rAG)Q{ZiQ)lcEoz zYve3KU@`DlgB9WyVgId^-}W3+e_j-}6%esO&WNOMR%w;n?T~*t{+SsQ%2+QD?f6%$ zB*$dFu+^FRv-d;GEQ_=Q?RX2|VAd76H?++UAz`x`jU*ov6-WB%2$ak?Hj-KPne!rtD_VTO*-P<}7Xp3Na+0wGQtp!Q=%4Xr`Z6BwK5yn6vkoA4 zbzlq8Px|ChN$L}uIK?phj`}z`CbLUtDVo=uRggvM33&Qq^ZWY?)u$xAZlxg}Nd+(7}sUq3+_E^i#Y4uGY@k!7W>UdwKL zjK0Sdm|aA@*XEaAuid6MBF11|q2EQz-|)8SLZ=M>|4qXmLzv=--stEHAdEVuBQ}g#V6{j z%Dp59QL?cMi2l{vW9KjWYBU2zVCm*KWD|QF@RG2H0r8|Wses%$>JxW+{gnW4C_>G( zs_tK&ZC5P?Mw;-=x@@OUaMz8(r8?)Izvgd@+N##}V7}$Zv!(l!YD^BnhziQuXuM=L zJ{~Mc?n+KDAcF5zk}6ZCK$UujBn$k_p0w~==hvAY?a*ic*uu=Z3AJEptzmXu0IxE4 z1EXW0U%biY3HKB##t&DI70fpEl4V+xCd8qSdj5<6$T&i>5B0WU7MK=pzjHdYYVb;T zS($@lYFD#K$T!R8MSY;5HDwrzv0T;{dET%^CRSI!>Jon>{V@=&9Z!T5_Mni-RNZ&$ z!}#{=6k$qDHw<4k8J}UM-fQYO;(XRlA{bR?Ko?MNc;!}m`|59Fnjrv^)mQEoQ z7r&>!Rua7`sDwG)POqR75qN-A8>2+=q=`}gD+!IPkQ+eSZ)R$K#eND)e~b5CmxGty zp(;E@5diFdptAatbm%A4L*t&Wkmx~Fr6<0s6nv3#97k2P8;YpaEflWl)hjqLg1xqp z`WuQ}`?$^4I1H0prnnOhP!%sfF!v2|Q6c&7;*H8tdpH~sw zJvmA3d!|@-oH>1pIt!(RcS4kuwuV*jS{UKYmcQ|TAo$MbFuJT6cUXi=Ro2(6QUshwq-eJ#C?gh_afQuR^4z}^)Y!} z>bKH&f~*{w9rI5S5i$^51?bGi{%u^IEpCI}aPDo&M$a7TtGwlg+Y8$8WHSZg1q;6y zuM2)XIZO!p@{;Y&YGbimDK@U4@*<*Q3R*FrrqQ(;FonePEK9d^a#pQjFM{N=6sCI} zmcLy*`^C44!=ZFNe`?(MU_DFs@7n7cvlqxo<2D<(T4qr{sK27%l9s98C)aoA=vmf= za7_9}X!^H_wShP~ono%JKc{~7s1;x;IraM7vjVAfJrT+33>ti+Kzpy-vHP#&8SWqhksywe| z_w-Iax61-Y%4`%+q~rqWG0L#{Sk+NkjZnig{_xeiPADXIAkSM>kY?o~Y%!%x^9h*i z%sq4Jb&?SW^d5nlH(d;ErMD(&f`b1Qej+1H{2&)(F+iVA_Z*^f#yl-_AG+ePK7^Av zJ9jM8r?L69dQl)({a*b+Rh}qJWfB@E0Q{7p1xeZfpT$q0SiiqXwMxpj$iz`D=ng@6 z@>bpA{k+PT7fkm==9tXD)yE{^T(=v;4K?sX^-_u?w9W8BhRP&-jYgA857e7i!NEtz zXUUZQS|B!r6%-<$JTxTrXB-Hl+}aFY#JsAYLIL#eyv4aXEyx+kJ+*mg+&X$)e8Z$V zPjyhq6Bvdr3No}^eW=}pUj^bF*x3pPn*XFc{vi;nnEukM7okMoQ(j=*`+iT)mvdLx z62?J&*yIgN(ujah&L3^M(1x^I1xmq507xE=0*eJ#$8r{-$QD&1QS(qIn6x`pD*usk zy!`EkT!{^xttPH8W+{c&|3uP(G%d}j@&|R6y*Di6F2O^F!tOpe<>C)T0tkie!ztr~ zc>`rIn-%%U_m>rAV3QYSrfq`5q)LPVLZ1VZy03w|bE<|YC42?=hJ1)~9<0ZvO%>k@SZ~vm}jn>yWc4@~A-9 z>J2Zy$vuZJo+ib`?e?UpxAh@u6FpT~LU%M+jrY|=xHw|IVu|nQi`-!g^v19o^cz-l$%^KW zHOX_AK*qKY_C54w#p0-up#urk5Vm#!wp!ul}bbu}gGz zPB?X1LQXg?f^;!iWj9$3$d9!}1`|=>m{>&&C>Qt8bCU+|e%z_%bbD-&xxr~`ho6}; zXGSpoi(LA`1*@r;2L25Vu9@{U8BQ^cD zQPY4{Nbg(08hiJ_;sCyPfil3v9d;|gjBIj(*PN{p+I5>sMS%re*yDk}t}OW;<=k`r zDfnqW8a?f;-7c_Zb4wonOCQF2daGT23cK^BdirPgfq$^!o3=)syT3MZ;-w$feEfi1 zRLN^N=?JIGbE=C9XNn2NZOz?&l#fO|gt;>0JwV`l{jlq=@W#-F!`V5e5-g3+d}|c` zcvot@&ecwtr#?<5ZR)yX6)OJcI4Iz0&9raM(L7m%iYuDEhl_bNC)GfdY0VJf?`FNP zC-x`T&W5$=zd{kh;_jou(;&VKLqUqC|1SlOo5In8FB`*YUpA&g(C#5mKS01p@ja}J zY%PX>yK61gGWg3(8iXiv&qh?PTYT#{j>;N>;4e7VL}D1i?7oKIZT2uzl0{`0bdI?c z+k@o{R)z0E4G{@;iTd}_`lQf(9l?;% zwz04(9y4y$aHz8Jm9Z3B>(TKt#rSxubfb%j`B4$t_@qMj4R{QO9eX>|bX0mmK(|CV zyvdoQ!y_TKPUEV8?Gox~J zo~VvjfS&+#BD`#rYl4^w;YQSZHQONT{N>mMKd4?(WH4>g@qXHN`pp}snhDY!)uv$sF=Ro+J2k!%%mCIv1`CZ`KX|7rZ zHI@sD^k`CiP8ySAw_xy6A~a zoG0+5akw;LafcNkw0h)S!)EOoMF3vL=2hz0XeyzXcv{Wx%XG+W>Id^bKE`LfY`U9G z8zib}UuqJlF0AJE!<81S1jg+ZpZIoyE~z!`N!)lIEv^jYX!88fxPu@_Yt~o^zvje0 z;H3oc_Z3-?V?XNtNyDl$XWtD}t{0dVa z80G2pm&6i3fyCP2oOZhDqy-0QOHN~=`Xr6!v`UI48E_DPCUir;e%mnkOXjQF2-7uc zAzd5D=!Pc)LFOWs&_!bRG`5Dx2j|@%GoJA)>sKR;)NQp?P?T0BUsAR2)yxm}{)qgB zl3H{B1O#KraF0rjGYMMo4JFrBug#V53)-B^_y2+6h3u=kOu<^M&bSRlaHi;~ubuWr z*$M*0e|yt69M&c-ZY{i^11;X<4_ELKg`0eRBR&x+4&?w)#W6J>IdZFHQ*g0$A#|TuJ4WqqUY@-b8gwpaf8a4%%HJ{=+3%~8*Mb9&?6-zC|MUjklHr87 zw$+T#?J)$%VBGN!gk-#0CA0q)4DX#{Y#z7dz8xyfpsHnB@6)=Y&7KXC-CAy; zB;4f9U@EiVZjiWEqdp-kC~b#KrAVqNNIB~7voEPMiEM~hYyuBrjmn--TQ76aUmb*# zRoo64L9?@Flq*$23Y}F*c2WCU$ppZexI}7L_-KuZWl+a-PY9n+Fvf*I!?|2O%tlL< zrQj419GqWDK+mMqDp;hBukpcw*8(KyJI5@rkQQuCtE-HjSsn%_mHLU%$6#G_(m7e- zi9(dfnMdkPnijtB6#1rfC)j*N6$!o5V{aO^;Zhv#yTV51_i}ol*KoAb7e1nHpR==x zwxcDJ^ovNSb2vJ>>tz<{JfmU9pB(?#^tJ?>65w1{&xj)^ditU4b7L6TBPF5@^>#v8 zT&cn=2$$W2+!jvi*~v3jzf%}Tn_pEGE@jDYz%4lLbiZ#}UbV1Hv%;yIATd&MPA#d~ zAVT@)A*c5rwtchD9mdD@NebG1vWHu7O}yQ+U_x%xm*C3o63n-~*K%CO^E%t5VrL4IW89WnumRkrLwRK&)IL!@ z!|H}~U@%A*^R^|Z_^#-7q|A=I*ae|=vWnaRzYJ_9eV3-Uz_XtqS1~k7=wU4nH zh7Y07L>$Z#)`C{VrPo*#o$uBG$n1Og2W;N!!6HJMEloyt-Mq=dZ7vik$j0+7WnF0nU64 zn;I;VOL(p65d#tB5*ye-M9HcOUwjUk{Syb3MrK|WOYAiW(UOzc4OGU3@P`Ungc1)g5)+%bxZc}T{hZU}1cvQH@;VsvCUEzYwFVSvyNCE>j1FRLJt|C~Ha1%2LtXpR-k@>hc zKfHpbQn3zDx3jK-DlkzLb8wE|rVdYpgQdDs(iE+XFe3FUx`wh4(XOOIS@sdoQttW_ zR?+JF>zAivG(=TEoAYKlW6IDakQDuefP2=gKNxIp#2ISJMP~*7;JZtq3@-u2q%k0{ zBN3zG#44%CXbbmTj`d%09pO$W%Ebn}`}&&}burg|4?-smm`JWI(R3QiSyCRw2U1jG8C0x}%nMK=mCZT5vDGbs{VDcy#X7|(RL*9QY8P@)p)H^<9 z%)UP!N?4F6#xoF-5%NDj>d4BpQXEKf27Qtw^7tgTcMqT+xD&P1a)l8oUeT=gdgCUD zahmwV2bp|n4`^paaUZPS=Ar$Gp(hfaGjtn$v-@CYUXkHa$Nc-`#^98+_Y+liKafBS zo_5NZP%*T`mO~iy1cXodx|xgS*qh{Zi^Q0bd$h=GJw!f5T|1ZfqZaAJd0`*aa-QNc z*0f5N`cyU?9JXV$t)3X$Q2UxZr*x*UqgHM&{02>RdEH9*vEKXWFQ;#1cqwtlX19s#>asZ>idwT0M=2Srkp|u7qK#ZAGvkup z^Te87m&4rqU=iXYrCtHFCGdlScn|Oen1sE+ba4_{LgMhbs3UG9*UW%v+f-@TYH-uk zvoH)9J0dNY^4y+Y!p#2Zd6*MKu5X@TfbwB;>}xHfPNPdplPT{n*K--Oft?{SZvZjc zL<%qz1yyc_nLI%FgWWDb;FLZjENsUkKz}}`vIDJcd>2Y&DatP=;Kx(M+YZj_pS@Nd@bdIJWZaNXnPD_EkH{3 z5@8@U_M&{y)*2R%1d7$wDyjEIc@Dq3M8uYC!RJX7K~$9!SE$^u zNo$JiOliADZy;cI??Hqm|F4mdmSXGD%69tJ{G{NqZP_8G8k5q4+ompj0#(s8YEFj2 z`O;L`tBve$>xb|=h#gPT#=T8FGyVB_b-tG1&Nw+A8b|4{LG%t#pQqE02*1?i*dxlBF!gsoTg>O2HM|$`h*P4j z*F=Gl*k%E}%-s{)kz>$CIfqlJe1$1yLOWrBa3hIsSrK@2E?c) zo(=a9c@7&%B(OaiV>NccFG|F`@niM>vzeu#V{wU!5J?IRze)SO(sHV=+SdaHYUK!h z5P2sVPX#sRJD&{+&|B}X1t`DE1#6ibK5MOpptZCX!|q{9T`VvE>o9H*G{_(M9|VJO zq-O0V=bOKA^mOt+u1_SsXO*Ps?An*wG9?5n&E?K6{qa;%Kp=XHm$#2Y1qxOlO>tyS zowrRoW6vA`K$faoWQ0duF|o3AWo@*i~RcI0H-wswZu(OM$|$=~lcDzj`ThBBvAh+utzqUqOZW!SdCDqHm+ zv$9d8i(4XmuHWN7ARPam=$bCmabth2iR%ix)i*-J`sczQ;ZUt);*liRp!EROr@EIL zuUwo+I^4#8a!~RHC5m<0BEa`gQIr$5m(KOeH8q%`T08f{I~&+lGoL846Kn4+dYZkd-OATG< zTEAz>@4>&&;D>Fq(5B=q!xaz$KS~%^fm%a*sd*x*K%{Dgrqo1%Qb${WG%P)te)uvz zx2LI{O*Cgu$;T9WfMmJ(eqW(tDyRAGTw81TFQ<+kea~;O952~88aS@iaa&av)(=%y zU$n}Z*WM6u@}pSEWs7Q{)25236=7sT($PLQCyp_1J0~#ra^Y`qv0Zq9Ug)$55V&%j z%(-k5GrX;|EEA_hOw~eqfAEo9a#!jmHJ3wm=VL>pw;#S1(=(X|q3Cd{<|FP1xo7Y` zfBJ;tu8BBqRDa+%yo>q0p0PLxOSNdO2v7z?w~}`1v>x@Q_oj65_;}7;<;BN?*;zt_ zxY&}Y>*@>JPCf7|=Uf}Km;X^NT}Cm;@b)fBaik^^YtdF$Cy7_AhW5tn(p;D*e`?UB zMiVlJvui-lvex<_E|PZxm8XP*TO)%d6D?$1pS>FH^LDxI;B?nuxfgTdR>K-P_t(L- zW9A+gevn76IY1$ODW?MZai%i;#E$CVoH1}g5G!8l@KrVb(Ho-pWrB2h(NCLl!hxTp zY#J!k?5)=N87(h8zag^Wa~_py*-{oAFGi)gvO{!>kJ)HOt?IMu%VP?d1H`NO^$*Y{ zC+tC4ii^P&euT$&!uh%g|G`S zO)?j^--qZZ?4he@F}dK@UbX4(W3w={ixAJcRrJPq+GqiJ2%EZa!MJe6MAwmRShb39 z-cB|6xc(sxMI^2CqgZ{csv z@U$w~Y?lFhPE&yBn9hF$z-=Dx<;-er%bqwl8!UZ}4<@zKHkZ1t62Ss-2)l6t4OniF% zN3Q+ri&B=QfEJ83+VakLZW?amiW}Rj0=#B*h-POq`mkH+o;hWs;u`vkp~j)ky9d@& zCl2aN(@!01_MUIx8AuNV#oJg+zMv-4Yp6PV5}C&znmYa(0j8wTLnd>8b3nb~QtDP2 zC$6~W?;Ue=ndtDGrMj2=w4uZ-W$|AjMseobWlle7jrh7JV3lh$T=+Axi%*rchc@cE zv|Dt|LN;4)QUastxeyY;z*(o;zKa%2M~xky*!=zP18eVX+7@^nXj`+1`7U&2i2XC( zZ-?xc?g2vjEk`iR8O%_^>2+z`6d02xOoUDI_l1CXb&JqeX z{wgzRxKVT=+M9O2<3#bWnwWTzR|kY$9qQ~81XI9jjwLzH6uKmOE7j)kbg-ERtLm1a zSGj!AVNx$jxY?Cs^U)HjD$i>FYMAxL^mTBy;aQuewng=?(5cIRKVGogJuMOr+Ugtx zC<4Y$x%@w^%%<2gFVr(Egug*E+4Icz&}rZC#E3~$b4!E<)l+@bcWhl&zuJ9Gh2%>b zZR=I;i{TRvI#jr~Wj(s*ors6~>jey>{HAnA5#~;=d{@mVI%k@0;K5zd!gfa!wBbuJ zbi=*aHMBf9D4rYqch8nCb_o}mIxc1p{U0LUD^tUprAt`5rga^h8eye~1HY-SDEyqJ zp{Fh7f;qFeEHaUn;}@SY>pF3Eeu`XShlRUgl_Y-nPp{F;Rro0LvL``L!THb1tNU#? z`xSa-M=?15L*_Zg{16r6q^-Zi(JM=rz@`5ohB&n+#`I>)%^5m>xW9{E5i!7u@p|U*m$f(hxBV zG!(3FLT;8QU>bvONVl4U8vo{zbL zcf{&RggTb3iNoC=Z0o%`!=*^+hbr4P4xR-Lyx&B zaVC{n*eKQn#|4>0m=2%J&e)3hPlcI~jbqcxrOjihPt`N^WQL!V4nxMpY3Ddnhj$cX z1*0bj(gpP$6J|v&(1r#4SVlaO$ZAcvCYEr0j(e?ttfQ~QUuXheI1W%xYqDC?$~@w1 zBe~(nlrY8p3$9fqL;>#gw2D(f2lgIM{|ZuIy_SMiDH_UxLr%AF)zb|+MD0bM*hp9p zz8~q#(`Yt$RkWk6P~!l~va>i%G8$vb_?|#{SG>RW+{)(@s^-0V?!?;vSTB0)@~P!mcg;x;TUL;}-=1QKHKf|C=U7NJH;1|bU6 z0u|uk)xf6^@Y7bfMapNn%_nb3`~nXJqVuA&zYxXmc!H{!je?VuPB1NSJbRz%yk*BS zqaR)HAk6@7GWc%lC3N~TYuBuDhbk)h^@T)(WwJ>muxrBKc%WWB1o~{p2bIC>(>_(6 zU{=+AZ@>`DKJZTLtMBZ>AFj87;)BWosKpdhtH#f5}gDEK@e1 zdPR&t?@J%J-#bPZ{}V`g_X$_3LjEUOe2;#3qvh=5V?LUgNvR8x&GYF)Vd~P)1z9mk zs47by7kh2Sn4Ukmmy~sU>N8Zo*7ttHr+E~B>HBNm-&B*d!p3|YKRJGJV0KUPv!Rkn z(-LLq?rDd@tg4|mhR7ZqW?xOT;ddb9+zd?vEs_3ln754vOdJkUq6K{=LDF{f=zi@(t0kfko&|lQkk* zraGnFT&%__+}f|?`Ld@QA#O*R{0tY*Z-JJAN(}U-FZu@uRFS>8R3)q>IipkKl=h&B3Kc7Jd`ez-yKZ;b5`6N-rl4ireMm&de*|BRqwKshg@X zRE1xF6w#aow#U4&#%Sjp>A2Q?d@Yso?@#yuJ}3#2r#bVkQ&iP`mg#31UdBRXU&v0I zo-OWIQ9^g}zSA7f3B+!n3QP3%<%B3Bo#L=RNR*{-A1Eex6jiIQx_9sG+8xVZLqTQaQpC_37f|J)3YXjqDp(^L!H-pVMEpL9`8^B@ca1`lvV_fKr8gJ+`>K7$J zi_|vL7G#J{$U=st9)D8JJP7*C66=8Tfez!a(ahTZgqB=u5oX#>6uG>(io-%Uzezb- z1cZ%KO;Rg-1>;No98pH6E2t^W%+ z{)k2K=WMIi{aU!L5j|uis~7ElsugK!C}6eTJ`mn|Mm5mHTK$4$_Vo{J{2)=uokSoz zxkmd4BAQuUl%_%8kTy{viv|sW**hakxnuS|uR;wv3>lE6!SY2`^!w&QC@69N!z3&g z-b(dnKUh?7IipyEDW6EN1cm*08l+aX~o(B%em^ zhhVuqrp2d8jgK?cr7mz1o8{!jRsG|Iog0#0#gE?Q@U#)Y#t+ejr-=gz1#KhDAo?J4 z4p@6~Y{ctEU?dK+rCXj>Qq!D0koCLkkdd3x-1CJ)~j7ytm(z)PCZb|IQ{)mlSCET0^<^ zDervil(n#qy^7E>-Ge!2X2#Xy=VM`@0SD-!YHi}KdY%|Binqp8_{|5#MqrDcx3dy2 z+j3)Jfe#g1n4o>Bk|ozqb`dc%VKl2$_%amtKwLyn_8`Zy(kGOd5Xq3Qu7w$Qw9VEg zSN3)hEWZQzR+WR0KL2KWRB--teHr&otnYOD^JV-U(YC`0^m4ewf@{3UoiDfDk;X4% z{0Rqf-M?OwO(YWvwQ5M;@yTD0Xw3*G*QK7(_zqWP;Px5zFZ={ykjM23|1Fy)>7iTZ zaNI=8h?-!3LiKzxDIWCOy?`a%S-rP>SCmR0(qwO08#j(D?ec5xL*0Q!@$@7lki zCU*j%`})6V`IIV}#ckram<&%>>ua$?o6-07cI}mjl9*VdyTcmxY@c_mR5~k1$c8t> zURmvlzxR67%SyR-@*A$plE;SXVgXTr91+`d?(gV3veA}O|G)*WsnoO}f9a>=`9&j* z<%Q8Py$%wu-m#8QWmDm!5Xh0DQqhlrJJj{lj~-RY4R@{L<&+eY32oaGl*#v6Cr{XG zr?&f(06SS?zjbHjjX_n*j#sS55La^^wDUinn8H5?MY}z{nh)n5)$E)*Nc>KGcl7vm zjVJDY8Y6)Rs7c&q%lbvNfYX7jM~t0&Fl4j?dWqfjU-Myi=4(szzbdmxg$txdoeOOk zVe+R{t*cC$F%FILP71*+RmRhc)q;hbYpS<6xQ!MeP(U0U4TmhYJ9Wqq9UHl>wIH9x zvGR?Cp9H8IpGQOqc3966Kq3jk-VQ98TOjk7kgE4LV9xU^ri4e1icc~E@SAl}uv_aF z1Ot(Uv;c|kiR^(`Vuyrm@-7!m9*^x?(%iBSD0G+m2ZQxl@B=-;ChJU&|{>38hA9sl~9|dw15C^NdS39?UbyLZm z#=~zGGma3Jp%7v0nhu83uh*fd4Wsre4tGEk!67*xK`MK&9BUMe%WI_Vr(6on<*tzL z4-=y@(8E!`I@2-0eG*^ze46?I?>w#gV^|QLy)aqnory6K%L5Uqq&JpMf_}D@A1~eq zvVcQ%W!X=7LLW9)ReiB(Q5QPtv@td+kyjolK2roGdcGy#P|_-wRF7gnBo4;ZAC~En3Gj4x|c|;G`_@8@P6$BjITy zv&GgLCYVXrk9!++9?OBrRs!xG4+MES99FZ*Z2k@rXYx2PlZ^7QaI8GVLig(eAaXFEP0Gdp4 z&yM#TX}$a3HtZ&rzD_nIK(}IxZg;Sd)B$@H(gkiB9aNGz|^00;w z%ZuJoVJu2ou?ncOsWjxQA{jrGa_XW=WXVDD@0>{)Ko*m>A(Zm>{b1kBZD9^MWOzyi z_DO9Nx;;1;JrGLL`45|u{w(r(@<~c9IrpY%TW(2KGpDT$E$?P;+-7^t$`x=!In}ll zs??5sgtUD}c{=_d?)L%LRXbkTZ}kyt+A>#P8((ji;foYc0O)Y5mY=gjl5b-kKgIDnn+tU=%YbWvO_i4MpbO zKL{3hF@(K4m)Zt2+~kd4cL8g%vuY9lKu`KmS$nW$=5qzMxm3?kT!KX6r<0nnsIwIO z1eEkl3&Vcg@m+i7l?#wg>nrN*SXv4YG=^k!h5#hQ);QI=?QQYy;Z-zqu|n_Rdy&KE zgF0G;1|6nF%b^9uSqT?)weM!n`cLaV4$`^AGs=W^;k;`gTDhrGU&0+)#Tvgn983#< z74q}pAobZBh6X4@bgJpf5JZ;9x`O1~a$`Zcp;5?MjaOfe&4lG$&-HFL9ubMGt4q*ORauy7tM^oE({fCInFldX#twY@wF16*d16{b6xJphV$RkjQ0i)0q~OB7fYXKT8Xc<)+cn z7G3KmPttt`q?_Zni3gZ|8N{jm{vfw;J8WT=jULE*=MG2n@ulGcNU*- zVSP7r&aqSR45Zdwm!@bnbO-D!YJgan(AUa#xv@`z;`?b^;d%j4Db3z*sl8V~7tTr% z^6zX^JU=cI<6(znN@=ZUb?ux`_;{e1Qo!%cFe1Grj`jzg_8&Vp#%rCE((YP--VuFC zO2+IQ(rre+0ENliU#t6y_|}l{*=95=yz`8p(>)ge(_8YdRW7OA`@u)dJBmX`A&|F2 zM-ygVH5k`BIbK%c3&P9Ml~aAjXEAcy{)nP;19DhI6 zv9MTFICMzVof}PjIw{lPn5lNJ7zIA9V{c(|Y2{dRumaoSpcuR94hMBCyg1_A)d(8$ zL~2o=8+l+skA^);Iiv0_5AWO@M5kjGo!+Xxj|+srt?@p1-auhO#5je8#UlE`t#-!o z!OiH&oJ1;G9qM4Z38z5XEZh1sFs;9<>yse^F_*RD_8dwNQ00!N8YYM7d!qa!5h|Jj z*xcA_f0CiXgOLxN#rlOLmUASkeLQJ-2R31DaN)Q)7>|}u1vRV7vjzf*3$Zn`Zwerp zoFC>tdjD7pduw4P%tf8b?=i-rM{(tn;wOykXQA(@8v^72U7hjV5$MROhI{6E7<;s;;o{!i4^|)n@I9)0H(=7Ywrpy63=i`FN6Z(;LhC)i& zehNkl)?v@s%x%L<)z<}!T^##~xi4XzlWpeg6}^5xAFl8Bn|>RdZ76mta4Mq%;4Qg3 z1QSsi6~BP6m$O9!vYA)>vJ6&(-z)de5k)m8fyOqFF(e20wEVS4S_4<`@O3UUBe z3+m6gl^EPuuT(evc{$rL6kgOML)rsFgz+uR`C5gNs`dPUYhyJBs#Cbpmr-bM%PU$f zLi6Bjfd`5XAOyfN$B2!B(K4ds-f@*m6>$SD@5^P;cJEi(FhE=9t7CDhCHM1c(ibQC z^ECnR;?Sv=O4V0aG5zXj8mq=Pm%B~Y=KyZfMF8OiW`ue@E!W?~Z2YBD{FFPJn;V=YT>30meFCTNxMM$RzJ7*So1@bnSY9lz!;LuTa|FY3ZzM zQ*!fLU=N(0?9f+$G`{FC@2+XyBkLTD~HIla&-=lEjrTrmqU$Qf{%+%n%%V3&^`dO#uo&K)#$wSUWRv@O!#|Q$Fp=p$l;EvIDCzifBk#BLboR5qIzF z$B*tywm7Qv7r(-QW#t~ZwRM+SUPREqkMS|7dLRccK<{#29h)`v*?_K*d?sa_1qW_% z(XTT}br0J6oHmv9?{v_I-a0=er6`)R*{RgZk99}ri%V0z9XW<<7z9s&yt_S%vB+XU z{`P-&I7hZ^J8C0+ua7kFqKY!8oOpy)lx{*ffMbuyEZ-!$ckkO7R8tk0|G@_VH2HE> ztd^ZUcjSQFm&1DUISNp;ZtKyC-5-c)YQ{HWWpF#8LDkWN=393|s9Jc)lk?pTbUzx` zc7<$aLBjvmt4)uF-fo-N^|x6*u8Q7pNV9{_%L%44_?w1w=&2DEe7O^!nh%g3usS!; zum`b>CiYg&pMEEeTBv?Ra`6c`=oT+ZW3RowQeB^YbH!3NDpj~`^ZS6b(G0yv)KehU zJH2th_Y*G4B?x##g2o-S24}A@?5B^qmNQH-30$l9oA$h16q*;|foLW9@NRID55Jr* z;pt&$fzU4Dja~^hXT%+~v`_XhKfUB)Bw0&u04gLXS+H?ded6eT`XKGB>^nIjQX0@9 zFjgmryQfMr*xkEYh>mwI$`4CZk~q z26a9~j~fDUu7F4!ic#|sTT8aw$`r1STK?I6O8Uo?CO=bg&|7FEeZtgAP}kn<0KP?0 zhkJGg0WKK6kNUIMM4=X9?-7;6xBnTp`XG?HIFM75HhHLr2ajl*NI7XFaxy~WNl#iq zpQ=)Lz4<^@!Pa!79Q<4cQp&0*$!Fn*{@rkD>HwV&Ib#-=y8#SqX?ig!%=*9O-sZ$mY z7JhAXL8nuEyR5pTf1iHdJBzcKzT0+}J_2c>F!D(X_2JoXF*)xyERWl2hBBN5A7EpomC7YIuWmKw(@<&Z%7 z_AG_xc`u(#ec8G?j|(TWg~Ld!d1+wMk$&vd(aUz*8y&Da+-N|F+gQmlD(4b6d_Wlc z<|dwk=T7YB(55_l)IX~En|a)~*Lli@kJvCODSX;wsmyqf>dvr_2?PVDvRbJY%)K`A zD+SlP-K1P8f?aRC@krUY7!b%O9{nL>STc`)YA4|odr!CG(PgY+T;i9nW~kO7tFHn{ zlTT>}MYfYAB&1eqMye_}?Y+oU4|CTMk6AVSR6J~v0Vo9%pZ?Q2^XOg>Kdvl4tnlXs5PHyb@ zoR$s12)%00lk^%4SUR8LQ~7!T4<|gBnZ@IaNTl{jsKfC08jwe3VnI@d`CDSN_LKB} zfYYz|Np$T-=IZm?G{@8I>j9GLWS}5E4=E};IL`bM(AF5OydGag`#uC{fPY2X9$5eG zxaXN|S5C_#>>5k-jla&m(V zJv4yDiYwI=V)rc2)R)E_;8{2|mD)NKYiq~sa-b{l8Q$x|ierQG7$JsEsN=q}H?4t{qI^*XT-}bugkSk85L-*o; zHY4m~|7?Svd7w_fmw8!TvL)L^Rk6}r_B%OB`-+j3Ac@{;>6<{w#8Xph?dRB+Eq&u` zh<{;fhg5)D?syYL=C7jDqy2C&nC}HFW}j!*wE!Fp<`3#!eozT;S97(141laPKOW2^ zeXoa@bcD4hnbmy}+IR;2h+5tY&K&g4yd}3sx_e>tFCgtnyO1U6>9r*ZQ^QW(xh@iz zJ7T52wr#r1WZ0IB%^Y@PG3`A)A1(ofTT(gbR;W(?l2q`#yP;@Pof*PSY#MGmimL}CJ71|-_$NRuNt!ptlS;}_CY1+@4xVK|kbPi5MF#FBIs2(X1!DfR zJCmSiZf4IC7m$K-@cDnBXO@3A!`RMRTA3tdi*(U_@3Q-S@v{VaIv zjMro@VWgQBo-QvO^`pT1EULxu6?(Us#|wL*wjgH+6)P5h}k0uTgC4{W+9a%GBJYu&soUU3S=WboEn)h^D=eRsaWpQHi^v>9U+)z#8u|V{QYu zA15pFGk>`lOsPJ4Zxhn;C(EtA$@o0)g-eawt>|? zpHSuY8=iZ&-WU|4;)1`QTtW)e(s`BiQt_MqoL>z*-6NIZb|#y?Rb5$~D@{Kxle_DE z0P2!(KgTo-ad8aovU=WTtMjtWN0N91?#9)b;o`T#yNyC1V= zO1Dv}KoRFHJ96{e)aq=NRZYgp?THGATiR0GH->?yg2K6E?$?dVYzF&zM88#wVfIOP z_Kl9e@HOCT9Vw3-cm#($`EJ%U57FNg_ULH@AZm;#nUsqB8HnJ;hQtaBC6K7S!@CEm zYbRAd_Z1WH!oHm5*^v^p8X}Kg91Pcf%2Rz z3O9km0U#&<7ddV0TWcEsK!w*1YozcV1DV!45qSTBHB_ zI+VJ|)*4E!_Jd1{W4U0@pZvBYxo+kp3`LZj|6)hG7_t>RPIpaeSjO)Ls!}i&4G{H| z`RvRX$W!q1tG|5%-JykC*H!6r>B&Uy(i?F=qkt(cC)W(8GG(=8`Xfbh0pwq!mEE(Y zqD=>skNoXHld^dQYW?f+HUk5b8=W@;jRrn*aUh>h)sT zC4h>1-#Fl>+fNQ}GE?gNRu}JDmuyH#H2kKI)W5>+JnwEBsG&ss>n40ABWn*TBc;oenbS{xQ8j*Z zCx4nTUCfx?THiXIs@ktNzADGPBxpk$nG{WMhDIFx%j-&g`_6lDbkkacmIIfrVE@DG zaz4(a(=_+o^$^MqOf8eW%1S*)=4={8xM~5|ue$o~iE| zE2^}2>?%?q{lTzqBTFH>u!q${9Wd?0I9ng%iQz_24X@()(m%SVV-mr%(_n*2 z@XiadFO{>D8XjHmd_OcW999HQoZc0%plxpoO1S>Clrk@mvA-wMkrUspi_oUx50Fm7hG?u&&NuxOE|Vo z5>u8(*m*p?{Tsz?#D14lD&LSBdi6sn@ryjq0m+kngJHGlk_1pURK4`1YW!P^>HNo& zwGf@(4W1u!!buyXPo06V7(Shfj%myO{bU3_G(RJWEQNTlNf zxWh?G!Z7KylivoY&!zTrrTk`cw_>kUih-e0u$V2U zrxgM{#wJj0`=b}S+>CO$)($C3E^q{hVcwsH_KMM`F<({rgDlu!_1HUPl zGXJ{^nCR92Nayh`5_hgkC8ok~!Jd2sUf zi;Qr|we;d$6mVL~s$ewcbJAV=3!-)PXqn@S(mpWQH}9ja0*p51wI=zS-sds=It~~A zwqYFms!j(rE-E*zj={X?U((AouZjS?2ZUSJH&*&}`D; z7m?y0N+_Yb_F!Zsvl&W#G5Lw|uFKHa#a-vWH{QCD+HU~62dDW~R3(*cH;25zY$%u% ze-G#**?7p{PVfmg)AWZfSityd$irAytgNxTI#>js96(FvANSdUc7XAAc*nZYC0aJJ z@HbZ!Tp6-rA`f%b2TYhTRF6J<;vHWV{#QF~y)4SW-ixFfgT9~VKq+v=i;U8GH2#B~ zn!JNbbye-1iC$o*mZ@JKSW8MhPM`ZW+tJU1>{$`qIy`>0~MpGA9z7BhURFm#GAyTKQU-PYmVm-i5EI9Zo#$G{cskt`4NBmTLxQZ}^j00J4_tavFJGm7Amq=SQvuqXQ zQs(GGHpauS2W^xs0m>{@#q^Ms69RTQ2fhU=h4Sk zo(TL%H0{fi%c7!1dtAmEu#PDt5UP^3BFAZbr3HgKYd{-7wH!gU6jIa<92E7OhjkJ* zn>l_!X{2eZUIo5S-fYzqOJ^q1FV z_dMq5T=sYz)W7BwFZ@IX>pm!F#I{_=Jp=+R#0$V2FylH~*u&kwrGGX*wAl>7|IUnS zqyKgbWS-raG_Lr9$eMd4mPZg4gyZO-2i=bI*{}c9HwD!0U;mrvoyhb)nJHVg%lQ^u zU?kuTK;#9XtE!MA)P@guC`{9mE^tNHIfd zsO>TF5t@Y@+1b*E7d^P}qjFvizu*UWFNG(}gu~DDh>ezzEdzlaYwLf4@KU-a1Ra79 zWu(25s)N%FQ9gKfPtSK&q2panAz-C(fX=N#+4#I|bPfGA<-G36afN4|i(x#ynbbmf zy+Qts_8-a)ly8ZH?cJq!xkSq_WxL6!VF5cmBE?i|NL=CGrwvxk)_ohcQsFP6?fZ{} zI;=Yc3sR26lpF!MPT~c^~tPA_1UKALc#4)k3g?2_=+0Cc~tB zg4Um)KB_D^qA|?0WODzR-IJ%zz=$xnvPMGA6%qmJmAhSc8DkS+VG|EDQO9qeXXS*`2bdkmGf7s*p6wb)`A&bGGw_+6V-r(7A~#WL3n!-@1Qa zAOXMJX%3n6jxuj-+Fd*ir+LX$sZ9eCH7hn!g)*A1?$Pk0xd1@bH|1&01L9O(v)ofy z1)9Pzma5}dQ)%uRUuP>k;&e`dNh}>7N~f$8i)_S(tM=_ht{n9d|3iTK0-Fh!L5bSE zh{3Z_S+xJf+LxI<1MO_9rC`BL%QF}y|2^sq6Lz^rh50RL1woPlnlNYGx9pDbKC)D0 zS7|T@oHX+T4$-+gthMCNjtv}-Ws)fKhmR2Qg`=sSBM8dV`bhbuzJZ& zYhqE;$9Setp=J&41a60`=B$+j9$4z1+0_`HBS&>3Iwc0rr=kTr@1=`!vGZm<-X`$S5q?z%e1>9Y$f;F90JKImhKkiAVfy~ zsF1^(4gO(3DXm*IQF@&fbmb{aFarK(ZQLb>%A1J~r~)Jfr6e=LJ^U$k_{&B_e~zzb z2P_oq1|Ky{#bxu0R>oFMOU>}p7CfHx|HY$5P8v;XmE)!mJ0^6D@TT4?xj+~Vla-u1 z&Ahcp((F5iq>T7dQNz?JlhcvoSAh-zD;fWdz43o>!*mO~0k5K z=yA|JZ!hFFsYyFfdd1ET^cNRIB80ai5N7qD5d0(|O8Rl-6P)LxNtJcT-O zKNEj=FZj{9v_JJcSriq)9(=uC_YgJao6W%+1rlnaKwMPcaC%d=P+t+UFQ|J(@LMY& z$s~r;<)acBi%SQqPklwW9=WPj$E^YloKNfc^TwtG!`OpL$F2o+I_D<2r|Ga3>A>Cz z9Te}izyr^f9DR>22ldwbk)!o>yT9A+KOiBXTS(Uf;VAO=$^>}_9sw?M^#U33@0m_F z{e9(c-lJWT!#m(b0bd@%jJ-Gss!c;XZ4P^X(Ck??&N415jh-%y&jSjiL%QN z&Un~I{O$o_YJ{%_XvTatK>*@!W>1>^cLfAUjR;yAA~?1H#g1OMwyqZyxWgcC6Xw&21Ji zPF<7nHO)v%D`;w|Da8DSU6~S~wDD9OXOQ%EwEqe#Gc!$GUdV5?0*qZ^0$)S1W%E?`?nAWNqE%Vqy`E3Ws#Dr0g9L#B3T@RnX*z)5)G!JJ zK?!{A&7)tr*_MTiTr3PeHypgp*}heM3Q02;XDbfa;`z8)I%_X#8la5jN{RRX#*s>M@XPg#VhN8S!p#1)1;f z9BLV$(QhHT%PW05nCM}PTTIzpKp*#yVeS5fq52xpDQoSxhZ&1D%QW1!VrU-I#Vc5~ zIt8{lTapH92n9INm1}f*XUeA6$axof;=FgCtqbNQ$XNa4OJ4AD+--GLUYyI&qc|VU znbxo%4c38GM<8EKnIP2g$x@-`*436F}pTI{K## zf{e`1mHv&vwZZ&b!yEo!OV1pdFAE;|O!j^%4Hc2qRYJ~1iuJOs>>~E`=ykPQr#9Nn z#?W;n@ai|>8DUJ*YT!7PM+AsXPnUddM$m4^NYu12CkM!hS6$T(94#jb)g(S^c(%@N z;ZUTLYqy7lA%5cw0LR4?*44C}nL$oW1AQc@J%?E@x z#-6mv8%Smbgq9!K!LeLU2hBjZ%LNR2YM7KwLxMrq9k9IfpqmHfX;*A&vw63& zDydUt|Di#5bkD<=M_N5W_gxLc>Vs{p8aN+A#Uc24yG&t==1}5?9uDhL?J&XvAon^{ zc{F@@;>PeA+)aC8O-9@_cG)4O|HZo2(@KNfj26{Op9-62&y=r1b$DAs&i}k;8JRNJ z(Uv!KsQc4S)ger@Y0nq^e^lbfGj%IMs{Kd0g{C8bJ`)!0=`L4-i^W z62IX1+MGYr>~D`(Z;9Hw&8zLjm|(U&_avI93)wsTd5QUpIu|AY}7Xn)`J;CDh=K#jCf=AlgqA(J&_qox6m zXj4xWGqf;B$(sBgy+1#&n{X+QV8w-Vjc-B4<0*(^z0p)In4 zf{M?GlZS9u6rR(Z`a$nDVlZp5c zL8r3a%e>s22CtLD-G0Btpm+UK6pM{Kt$E^qo(R@KMV1|ubh}vljNjzZ+-VXM2%?%+ z08g)q(S25lW-K#)b-pW;u|k=Yw>wwF1{p%xSpqqVfMim%0L(i_igURZM5h35-n_O; z8zMdVrjiM7|L$m;qy3*;9AMvG185=4n>J+Tj%Yj@?n{k)n0-AH?|$Ap<|)ly5qBG! z9^&gPoG@N{zfNkncP*#{GNFse4e2SNNfJL}Tim$V0^{dhI3|aNTlgEvw^5hCzk6SNqE7drMT1TL%1;?F9*76vQ-SwxX=M};h}Z^; z3y=_8IXEk#DIz1D!lSTBu!Nbk6+Mp|f3W&(z{{tN_9dwoHyosw?%oikWJkG!F_nO{ zKrf>4Pfojxg}+L|>SEB1SFbcb>w3>^2&7AiP8G~)*7;vuyte4xQ%Q!A-Jg14|W7swl_A<;g{%Q86Jm*d5=}-1r z>U<-Q+g@V5_UbKlDiSyyp#1+>q1q347QU)ZL=$165b%s0J8g0dmWRDG@-8V}F44~3 zvwrP_(WyG7&m1geQ)wwZ0XE~MOS z9UlFmcYbFM1uY~p^!20Y@j3APHqLM38$VAl)~^@khke9i{dXwbJyuy}BCE#sDIKaT zOfBgQ&SVP=8N}2fRSNNUtjS?5))bXC8nGSEW&uTp#Hx#C9O)9(tr(Kr`A;gV3d5Ce4n1&J23=QJ$R|Wh6k9Zm^{G|?T6=B8v)|INn5W{L^my4wRegNoS|F`c_ZEx?uUc5j5#vON zdTDfeqDY(v%7#%lTZ9BFPWvOTbo%$l>N+I&c|v1Wu}h>s*@F$~@X0=o_*HZLZK2|d zNg=xFoB+_`^@DdC6lMrz?x^OMlk3(@|G`5YQ{nVZy{V9#jD-mUX}03Xw|1mG6BiM= zIPJQf+DF96^FK=u&90FfRLB{ROC9u7T31mA$3Hy$6zLa6+9SO7VC(ABH6M9xGTjmi zpw=6$2y>PMYPeocD&k!Hx z32J{Dc)_jSzxi4AJfhm9)cpl{Oi@y#qolX9wd(|7(uiFX8`n?D?v_LX|A-&lK~XFE z5$4=sk=r?Xj>okOytAvi3*4uMsQ`2~u&>Z8Qi3^YyjD1Zhx^V+dmp@JlnFxB zzWw?`Qk)00sRZ8oI#o@#%8^HN_dc3uo$ZmK9FD41Xn?k}^)X`KfWZvNpF)cKwQxgkFz9jsh zJ=_bB2uNj(uacCEDKxHxbYziB@L^gnit=wV0z=opKBer26Pc=3P{`%b$GZ2PSHeaa zOsRAN`O_w+%X;Zv^mh(`9=5A|%U_3xq93l5FLSc~`uQ58uj!Bteb&-_e06)d=0q=8 z0YMBRVWO~zK8ePtp=+{>^X)884N2hv`qK@3-Q~!{+x@fua-!++CjEYVdF7#PS>Grl z?J|G0g(_L_iFU412qFYI)V%+Uts~HDaBd{i6L)=#MTq3ZIm99`DL^(%xn`xk0=cl)vqOkH{PcxgmuKrQ&apfFPK5) z)wZ3iM^#!7N@01<#^+|bFQ)MxpkTJuQf}$oYZh^G^RCenc9q>?LLgb^ z(--BCC|5?fOw;pANejTwtri#>4!VQ}9v=fXw54MuVaHhhGhe-6e(ubo8w^kaq~E5| zwt&t5w)WEE9<%y`T2px8nnk&xD*@9w*a_8zC0?hu<5bKISnTyxH-~)tEQhL$W0Q-m z(Nk5JnHb-2?-KyFO+vNT6ML@lP)@b4WR^Ud@SfmzTs*IRnP1^elxM?#u%OswdU&Y3 zuCE%deZ3uvCk{+)0Lv^v3wB0@f8-Dssd>!bjj%V3yd>1i5;79|a)2wAA(QRI4E) F{}(0Gc*g($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..9b72b39492803a112ab679408d6b450bf93c7b8f GIT binary patch literal 820 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&VEXOp;uumf=k1-qzS#yMtO3hj z?YdE37a3`<g@l?#vLz$=4}0wIjgNuMt)|?&Yw$< zUrDaJ#?oW;`|VSE({*?LT*~i}`#js8d0F4}3Gqcaw$J3}HGCGIRX;!dTk!R^=%3!@ zz1rsWXPc{9XVri{QE5ZJG0(;?q|nOKdwIgb@P+`*79AyI^_;Xo-V&}S#(?W z&+PYKb|3rt?N34U@_$mF=1chd|GasN>EjH!zO{KUF}2ZQ+XGzYV7)|7`=x9{k%7z5L$RxFV{bITDwWr1juYTMs-nr!+xX&5s69Ko%uxW#kPe?ve}r_ z$>f@@Uz(zl#*&7_U=)+lxXc*Mb-%HHw5NaeocH~`&-0%1d!FZgF6Ye)@ZYYBS%pC$ z5V}6z9)a-rr+VvX!&tzMwm~3Javu-3-N!CXU2;hnjmLTsao?~CUyYxYOUb7r_v$?P*-mR2M8?W~xG1P%F>)*BIq8|DUn3lZmjLrb&Ny@l++n?^T5#cgkZEZv=#aAMLVtUE&Xh#fP4L|1@FHSfrg(Y}0RdpFsU6uQ`!C%}-31{R z+SFhPMb9b}hbR;hiL~7FOjcwJrBs-m(r~~lh&9CN{9&tTF*xgdyhK3`ot1)xK1eKDL)=|t7UjKLM{;kW#vU3 zf}{7`vix8ycwi@|D|WV;XRS9O1=-OddUeF_kFlqKkKFSLXXg>Im>Lj^t06qF(tzW2 zM3L7rlSd?c<~!}xQnv7BQ69GlYSb+J7J6SdBbzO)U2^AW=cB%1$$Kb7qqr0`D&e#D zJYx35b}v19qhv%f4r`;uvq70$Mun51cfU3BN5pW0+T*go3FIh4KbOm_Aez%_z54F(%G8R29No^_UwSZzhjxnDew~=hdY|*O7xa zGgJE=x0)5L2y(@Py}~e44p#Zy(9qCy@IttRKiz}YY7g)_Uk9Ckh8wkh5}*u~=;j*P zye73RVYz>1*$G6|=KhW5AHrVX_l50jwV!9xFb@xG-PwwhyZ|lSb)29E~e!nJ#&#LMuNLKBJ?>lCJ(?**+`BYjSPE?xH_jRtp{>ng5hFXQre7C?iF*~R|q#FNX6I&zB4961Y35ZGj?SIIR{Lmb8D*VS5wet|_RzR$z)fpHcdTG1*X> z0}_=lSa!brp21l+XJwkymoawx32au5_Mn6Ww0PKBv6fetBRH=ub0^ z=w9C^xIb9|*&0J+b-n`s14$O@EM7hA<=`EO(T0;d1D8R_A>$38*IxkGvW$0=oC8d< z_qa0QwCq*AeVJOJr?yk5IE{arHqkS}k#ZN4nWek6_lngM32Ff1AP1f>-@FgdCEA~9chwyGO{JGsMUUF>o^DD(S_DpY#5sB z;xpB1RZrc0G2hje4u=z zyxruRk+(S(m4|jY1hFzO{KwWG{aq$u9P+1W%%14E}~O zW6R^6l+s|u+5uQ~0Ac`8N|C@1hXbhjvAy{^9<7W*NqTt6vLtWQift>T%_R#!j_yA+fs{^kTn(qQ|KA*iiVf*c}sQEDfM0l@WoMO9U!m!ysct;`lI{>CTGq!CD z0Jz<5kW!*33IP4lu(nTRf59Y4oXyVo@9_VsIlfU!86kw>oEyfNVT>6(_6UnzwqMS< z5keTHlxw5p&!)f{G@AlT>NhD6f*%2ob+IhVMS*iF%d)o$Q1Z7Fz?K4A3anbIPk|Wt z*&Urur$wR9WO=qGNXd685DNZ`Ma7?-1D5{%KJ7Cke-r>8@K5><%^%eSU)AhT0s z0LrpB72gG*(K_hC#FUMK?*cG9sR=DA{&qM@S@Zi3x&w%1QN~tqHsk;R002ovPDHLk FV1n-x%*g-% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..6539176b8487d93162dd7df57f3528eca69df99d GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQYM}*jv*Cu-k#gY$)F&>e4zZr zd?oMbXfClu<*^DALKqns?4_)qs(8P9w>UlTK08oH1G~>>eKw}0-xuEo@)$f_{an^L HB{Ts5#}6My literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..eda1f4bfb568d5b1ea19f15f24d9242cb27defa7 GIT binary patch literal 451 zcmV;!0X+VRP)zo)Bxs`n(q@(*L5!lA_@v~{l2pP0^bTDtPsK~ zrL2_FN+~U#-v^e6{PmLJ`c+DKmTP0?!)mQ95e)_qDu~wrh{$TKeH$mgHwSb@M7Ufo zbB{$+Y<>p7zRryI`yBxAcszRWt|#9K%=vG>-}^c@tVRR;|@rAP2txj?U+EQ0SN(&+Q3v z^1TI8!N*u!{J}XO^zeJP&y@UL0%E}5={q&Qw5Oyi))G002ovPDHLkV1j~s%9a2C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..63616e70b52120b670f04f00c276c707f979efe9 GIT binary patch literal 2483 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�*G;w$U9N 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 IluN|_0b@DVZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ba4b591abcf9615ea0cee2d2ef3a5d1e7c42a8 GIT binary patch literal 6255 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 MrlCf;x^2||0(0FdR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai.png new file mode 100644 index 0000000000000000000000000000000000000000..3c81e3a751ec86844a1fb383a91185e12b041561 GIT binary patch literal 6761 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..96e953660f8eaecc60da577108813a81695c3102 GIT binary patch literal 453 zcmV;$0XqJPP)1ujNNuMuM7Rv8xB%yAu8^IjQjE&J&&^HKE1RzCYSt8Bzuyyvp*eU%VHlF8X=z|gO#mf?&>h*`d(qhbd~qCabbGmc zJb$uRRN~{lWMvs}Ou{IN%qF2%CSepsItfP)0Tdz7rMUue9P7HT-F0qrthxf4b^H?l z{}9CSrj~Hk<8%Ghu|8e&6#PkEQ8k}}DL|U01VM0RV!whQxco)b48d=fyGx^ozykDg z_`ZK-YPU{2$8pLK_`Xk;t&GF7Y*m|RcMfa~kbCagHedpN=H4CugzI*fLDdZ0-n`c|PdIq-Ef=QyE(0Z%&gW8I#X9TE>0xyqkY{00000NkvXXu0mjfY`w_) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..96e953660f8eaecc60da577108813a81695c3102 GIT binary patch literal 453 zcmV;$0XqJPP)1ujNNuMuM7Rv8xB%yAu8^IjQjE&J&&^HKE1RzCYSt8Bzuyyvp*eU%VHlF8X=z|gO#mf?&>h*`d(qhbd~qCabbGmc zJb$uRRN~{lWMvs}Ou{IN%qF2%CSepsItfP)0Tdz7rMUue9P7HT-F0qrthxf4b^H?l z{}9CSrj~Hk<8%Ghu|8e&6#PkEQ8k}}DL|U01VM0RV!whQxco)b48d=fyGx^ozykDg z_`ZK-YPU{2$8pLK_`Xk;t&GF7Y*m|RcMfa~kbCagHedpN=H4CugzI*fLDdZ0-n`c|PdIq-Ef=QyE(0Z%&gW8I#X9TE>0xyqkY{00000NkvXXu0mjfY`w_) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..f14b4ef0fa6b3eecdf2106102180f93fc8b3f4c2 GIT binary patch literal 2005 zcmV;`2P*i9P)s{73%tM!h~dZ&mgD%Ga(jfy*W$`C{<%a^N(Mpxm#QYNCh{=>DJQtV7 zqVco^0C}$rRhAG|h!tpt3EzqVz+Ee#{60lRFa*rr2RqW2!pmQ=1w`X%YiFN|t8*#_ zc1Z|^$l`+`U|^Sot8*%L_Nh$BS|b`yTOaII;ZszMCV>uoIhOTq_WU)UjDKcK*@(Llf{P>LYR@rc}61V z)E$N{L+DME;~%+B=06z$KD)B)xaYGg%QzV!*M}$g_$zXOq07L)4h^G8LXyyd3)gZ0 z$dQhXCdqw6mpNBi24DURgjX|(RkYWZN43c_cXE~ z=TlUKmGv%=(BZhJQvQZ=LiF|+&9`84*-1n^AoGL z#{>+~r5CYl=OXgD$rcigr>z8t5@z9Cy#1cu9;qV!vM%t;w9I}-<7unE+s~pfjR&Ji zpugMi@H_i+)gbX_i-X^%sEAE3BO{Tqj0D7{m*G=XA^x%oXl^c&)3K8gFh3ifAm?@= z?ax&UX&dnJ%a()x+>u7d3pjVA(ZQeh$`$jMRltER6RSQGK1F3?UtI#4w&#$M$nmR7 z#ru7VidCP916^i`+4!;N%>`KhtT6u3BpFZWyLmA(+`-y=>vWikO1O~U5X0GKwhs%hE4HWLo1-X%J`4&BW52~02&K25(zX6Lgcaas!gToH&4kI4pi<9>V&qV#C!d{n%%vG7%R?xChe^go z_{&;AsYz5>!tEOxZqsv{du;TKDAvxk>N643Omul=jL+oI4?m_>48R8#^?CTY{|&~p zqHo!W?Bi~t%S)nrUe_=^(CVSCLC1N)t$_F5C{47{c&!l(tzT@HS4J=-HXpYFE?mpu zPB!ZpyOYhb)VLlf#V-osP0_8w)ZNmqw$XSwa4TSM@EOxkFx%+?xoSJ*LjybmMaizgra3b4K51zBRlQx^xZ`_W@ptHUFQIz77| zJ$Cd5*k!0s5VR3RRGA5r(1Bl9H%QcLh+kKqu$|zki-U-$vO^|bR8_X36S=fE_FI61?puX73ZSOZ*NYQfV2-_d==lHAI?1a$My zCu9NMc2b54hQJyT4hBe}LS#N3Ob@hrDBoxjtR6sR;suuietOUjprCDlS-{mf6>Bpz zH{nxAx7s=ju*p~{xZl`27oS>@{f*EJ6UoJ8oIc=3LMKfMAHF`11zEy(@3y&O2_OHF zwOS1mKRswiWPc;V3h?>O9QL&|LX{=NrkC;OCr$2t2EFYjG=uaE0LA7g3YM9<0Q=mu zVGAGyQ_V2pZ8y2UL_$H3_6($uBRPQrB=kn)b$5%TG0i|Lz}|jF0x(mk70N(zak<%gsm_qQ!#e1`n)@Ak7=eLb>4>RQow+RB7fbeKej@tGWxjTgeHupJLq473_%UH=O# z$kMthvFoWYQ0%|}z*5nAE}qKJYM3k)2gEI~>MgN)^#!=aEv$e$*{q{EYAY~%pTwVP z`U8Z%0u)nsiTT$v38L^RD)PF9hbvO~n>RsKE|8k7N`Ey$wK51RU~P?lD^ZOsRR=+8 ziuFcb*J|Q=!uCS~kGGJ7w6Of(#M>TMKZj@kvaGzW;rdbwP)LC8WU~;hjteUw@N5Zz nZA*@^dRPMGaAbW|v?u)wE5X)16nVyP00000NkvXXu0mjfe%i)b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/default.png b/Resources/Textures/Mobs/Silicon/output.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..f14b4ef0fa6b3eecdf2106102180f93fc8b3f4c2 GIT binary patch literal 2005 zcmV;`2P*i9P)s{73%tM!h~dZ&mgD%Ga(jfy*W$`C{<%a^N(Mpxm#QYNCh{=>DJQtV7 zqVco^0C}$rRhAG|h!tpt3EzqVz+Ee#{60lRFa*rr2RqW2!pmQ=1w`X%YiFN|t8*#_ zc1Z|^$l`+`U|^Sot8*%L_Nh$BS|b`yTOaII;ZszMCV>uoIhOTq_WU)UjDKcK*@(Llf{P>LYR@rc}61V z)E$N{L+DME;~%+B=06z$KD)B)xaYGg%QzV!*M}$g_$zXOq07L)4h^G8LXyyd3)gZ0 z$dQhXCdqw6mpNBi24DURgjX|(RkYWZN43c_cXE~ z=TlUKmGv%=(BZhJQvQZ=LiF|+&9`84*-1n^AoGL z#{>+~r5CYl=OXgD$rcigr>z8t5@z9Cy#1cu9;qV!vM%t;w9I}-<7unE+s~pfjR&Ji zpugMi@H_i+)gbX_i-X^%sEAE3BO{Tqj0D7{m*G=XA^x%oXl^c&)3K8gFh3ifAm?@= z?ax&UX&dnJ%a()x+>u7d3pjVA(ZQeh$`$jMRltER6RSQGK1F3?UtI#4w&#$M$nmR7 z#ru7VidCP916^i`+4!;N%>`KhtT6u3BpFZWyLmA(+`-y=>vWikO1O~U5X0GKwhs%hE4HWLo1-X%J`4&BW52~02&K25(zX6Lgcaas!gToH&4kI4pi<9>V&qV#C!d{n%%vG7%R?xChe^go z_{&;AsYz5>!tEOxZqsv{du;TKDAvxk>N643Omul=jL+oI4?m_>48R8#^?CTY{|&~p zqHo!W?Bi~t%S)nrUe_=^(CVSCLC1N)t$_F5C{47{c&!l(tzT@HS4J=-HXpYFE?mpu zPB!ZpyOYhb)VLlf#V-osP0_8w)ZNmqw$XSwa4TSM@EOxkFx%+?xoSJ*LjybmMaizgra3b4K51zBRlQx^xZ`_W@ptHUFQIz77| zJ$Cd5*k!0s5VR3RRGA5r(1Bl9H%QcLh+kKqu$|zki-U-$vO^|bR8_X36S=fE_FI61?puX73ZSOZ*NYQfV2-_d==lHAI?1a$My zCu9NMc2b54hQJyT4hBe}LS#N3Ob@hrDBoxjtR6sR;suuietOUjprCDlS-{mf6>Bpz zH{nxAx7s=ju*p~{xZl`27oS>@{f*EJ6UoJ8oIc=3LMKfMAHF`11zEy(@3y&O2_OHF zwOS1mKRswiWPc;V3h?>O9QL&|LX{=NrkC;OCr$2t2EFYjG=uaE0LA7g3YM9<0Q=mu zVGAGyQ_V2pZ8y2UL_$H3_6($uBRPQrB=kn)b$5%TG0i|Lz}|jF0x(mk70N(zak<%gsm_qQ!#e1`n)@Ak7=eLb>4>RQow+RB7fbeKej@tGWxjTgeHupJLq473_%UH=O# z$kMthvFoWYQ0%|}z*5nAE}qKJYM3k)2gEI~>MgN)^#!=aEv$e$*{q{EYAY~%pTwVP z`U8Z%0u)nsiTT$v38L^RD)PF9hbvO~n>RsKE|8k7N`Ey$wK51RU~P?lD^ZOsRR=+8 ziuFcb*J|Q=!uCS~kGGJ7w6Of(#M>TMKZj@kvaGzW;rdbwP)LC8WU~;hjteUw@N5Zz nZA*@^dRPMGaAbW|v?u)wE5X)16nVyP00000NkvXXu0mjfe%i)b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..05de742794341c5e5489daa52bef423933d51512 GIT binary patch literal 721 zcmV;?0xtcDP)lu~bT`J!B6mjtAY%u7W$0>~vFnzti%~?7m^f-pJFgDiZR$yBQ*xePv+@gsW zr+2ly4Rq>DXTaQ|2>|#w^V*ILTph5lryft)*9Vekfi>AD2dm%V)ge`=3jjEFFbn`# zt<2-io%2|&%%hku0r+*`IOER#*8R<*Ti-K1Q-!*)9%hL};=Q&&F<*jpIxj4ls8!2w zp4JOXt!)F{`kq^$RxQJfHr~C~d)Rp*Th~3&oj^3vV1g zo%&L#namoZ|7Z`shr3+y$?*{!?!SN!(=RcU8FRIDnx8TKuHs8Eq*GsdaChI<1OV*l z-sg%xyZ-=}Zr^alzOJkT0PdZP_*Mz((pM^lrRwnC7_+m!m%=*ql}h11_hK<$!p5f+ z?AhN9l{&pybm%LskaHEDKgr?9xyyFj`&UnK@yaj&|5v|V^Z@{|bWV&e3o*JZL~Jl4 zVuKkGzctZ_rE^+;G5M|E)GWo)IWctY`d{(MM-QDQ{s8&|=ntSjfc^kq_300g9R&RW z^as!%5cv1`p!EUJA7BrH{s8&|g8x1rv_2t(kgd*7uk1Mlu~bT`J!B6mjtAY%u7W$0>~vFnzti%~?7m^f-pJFgDiZR$yBQ*xePv+@gsW zr+2ly4Rq>DXTaQ|2>|#w^V*ILTph5lryft)*9Vekfi>AD2dm%V)ge`=3jjEFFbn`# zt<2-io%2|&%%hku0r+*`IOER#*8R<*Ti-K1Q-!*)9%hL};=Q&&F<*jpIxj4ls8!2w zp4JOXt!)F{`kq^$RxQJfHr~C~d)Rp*Th~3&oj^3vV1g zo%&L#namoZ|7Z`shr3+y$?*{!?!SN!(=RcU8FRIDnx8TKuHs8Eq*GsdaChI<1OV*l z-sg%xyZ-=}Zr^alzOJkT0PdZP_*Mz((pM^lrRwnC7_+m!m%=*ql}h11_hK<$!p5f+ z?AhN9l{&pybm%LskaHEDKgr?9xyyFj`&UnK@yaj&|5v|V^Z@{|bWV&e3o*JZL~Jl4 zVuKkGzctZ_rE^+;G5M|E)GWo)IWctY`d{(MM-QDQ{s8&|=ntSjfc^kq_300g9R&RW z^as!%5cv1`p!EUJA7BrH{s8&|g8x1rv_2t(kgd*7uk1MzW4S0TzA@8jEkm* zo(2d6(nPzWycG4$pP{Cz$Zd|7IUtZK3ynJI6PGV~4xE8`=yn1Lr@7t>yyQT1PU|>z zAobEdGnAUm;3C$yz{+IxY(VI(dot%71_g zp1duln7_0Fyo)3O-x;={eZtnB>9LE)4n7I(i*PPKS`*KD>QS=8mbOzSTQTi<$1QdV zU@xVCLFtUScO+4w1w6@nyWRE1@f|Ee9SCNJb1w<9FT9Ek1S=ye62~bP4#U=nL$X+z zYlermDBRLZe19&%`)7M?t7of9w$_@JYs#5SdHP4NMW{0dKkw5xUXM_mI>$Kf z?|`Y-$zIxdyLXASe)!GcEO~Q8_2F>vn{SB zZ%+u^4Ye3@Ct92;`|w0R*wFm<^3zh$I-RR|{JMBy1xv({L{~&3Vno#Tv@%|F^4$lz zlqFbja1K?>Vjaxy$klcGvifDQGax8h1~n`oM($I*pc^&n2WmlwSvFQj?%PooIc3&b z1|4Y6+hdCJAA4dIrSkdT)WMjVWq8tkI$1iiyV5J2DMIQs(W#7_TwttA%l&lWk)5eZ3giPKiWQ;{FEGy4Ovw~YWFQ?ryOxX z{6p#M*nHgB+641Ad@}J%uWGUHH7R~QS-T}MiMM_l*%)@e zxh#s3nX#$1=+}9J*Qm!shrcb(5Eb=R=#WmjCubZ^GCAx0vem_=#_%-xM+)V7~S%?Sd)3`~v-O zDgf7)-I!V#UdJlh5D1>rd#@vt$u;I$N;l?QVxnFeryvKrN6af0J@E4?z4sXJYdZ!R=$&0;UgN(77k1{(Wbm= z9O@-q>c0~Pz-BOg-BOjD8M=DwANwO8K*hjcVbT-3|611dA0|8tCgvDkmV18kPpMhc zI#s&SydjI@m{(Ag+iNiCuLTvsv@X5|$gcF^A6e%aWjQ5k3=9^kP>>p!lHL6an|~7U zl~e16x^|l2p6#x`xEjg+50Zxwlu;q<3}8ZG^*s@FuF%7%m{}`pm%%Np=&7^(u$Yl! znoINDSy}$xCu@`u6y?-!)kF>3BYSosO~PO4G_Jqc{l7rmV>=to6g~vb0#;)omc)B_ zb$*Z1TO5g8{e5b-(-CwcU;hYY*Y20n4na$&?g^MHiEY@5t)(w$v_ z@il}oLgxIfcH0unOuDP-2M=yTPvJ_c56RH8%sJCr x`nAeQgj#8{L5ZW1os&KkQ{U=i>h9Up} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/horror.png b/Resources/Textures/Mobs/Silicon/output.rsi/horror.png new file mode 100644 index 0000000000000000000000000000000000000000..0a807c0c2354086be2730017fb4e4a7eb95afdd4 GIT binary patch literal 1404 zcmai!e>l?#9LK-y80+ka9x^|+GHuC2$u(+>{AxWyQPEag57H$jg}M8NSy$w)iI6qX zg}VH_{8)>=l>8>)a7N9{!WMF?r@QO^>Hhe9KF{;|y=yYE-er1zx_SNA68W1Rq?=|*;U4Pf%5yoPX-Fw>TN|2@_oBkM7)H?M2yPU+bf zG7%R>3{9hURO7Fv*!1bma7m9=SdHv^18c9xY8O3yrr&n(?)pr#wsrWc0hnZu5XS=Q z#s0~ci0ZW`7j%AW#!JrI%kdo&K1_G0Fi*Se1lO_F?SfV9 zg;Wv^@{fo?F)FCx4d6`CC?SB7*Fs8MQAyh?%60-n4C$ zGjIFy8awCEm9+~YrjmqGnwpK5Z2alGLKfVdj}x9KyZ=t(Xfc43z4U_dVt*!2kM@Xq zCbxHi&3_PxzIp&aG!WXYz--x<%@TJp2$M+Ybolrdnq)mqB5Enia!V9P z2^HIkMpu;ROc^uxSh>mYRaURg6iU~)-1l-W3)i#eNb3?VP&_m;0h3g-_Qm{I+N3-) zn|Y_Q?@vRap)e5LwRd-Q@Yz9BcWrerS#ix+=?!)+Ju`2toA9n1z*~A>D+~_%-PGJ7 zNK6^^Li@NkcqOLzshpTvQhsg__f5jLC^wJ-;v|8)qR5vzWWmP^;!DNFe9Lc!_d@4W zNsI)W1Yd5UHGf-wi_%&l%~oz#=Eu{Do${S^^}C_8jxMHLI=ii%mblcT$W~U3(8OV) zDrQHFaVjY-D8L94niY@G&*w0VY~KB#JPd0q(n!Z{x@CBi$jz&;Orl!p;wDOnJYL0Y zR5aAl)UNtGn41kz+Z{0Xd3q?`!I3sD8UtUAw~L3yONdl3N$_6uUm+t>iQ%ok(G;w( z^xlyh*3kIs@n$^d_(V7YlcVpFfhA`Y>OSAF4qK_HL11%qHngeiQZN&pm}H(UTRR&1 zEMN>5xPWz_v3t5ARL}Kkj;n^F@PR8!8LQUNL({kKrhh8*q~~t)mXE070kEm$l*!r@ z#*16@tvdR@sXpF@oPnKW*J#5LufYgdyXF5z_)ka*0k0>tp~2UT{ga6w>4$-isMmO+ zbq%Su`D8hH)yWUe?@@`3ONZ4ETvJS$#|P@LHDaM`AbQiPwmA}N&)09tCn7b~UlkyG L__&wvq9^|aHQlu+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/meta.json b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json new file mode 100644 index 00000000000..a40ed37c604 --- /dev/null +++ b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", "states": [{"name": "ai", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai-banned", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned-unshaded", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned_dead", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-banned_dead-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-holo-old", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-holo-old-unshaded", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-unshaded", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai_dead", "directions": 1, "delays": [[1.0]]}, {"name": "ai_dead-unshaded", "directions": 1, "delays": [[1.0]]}, {"name": "default", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "default-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "horror", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "horror-unshaded", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "xeno_queen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "xeno_queen-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea194039f4fee0b41d8c2f4b5f602592936f88f GIT binary patch literal 2484 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 J>Jkle`KuUq)W3#)#J@YbINTAxH zJ#B?6gPux{+Np@rdR7lbN9jX;0f_p&`fZ5m6zWGkK^UWd@hG{Lk_3i z%vu$~%|4yA0SMbW7u9%vw7j4zXl|#3Ga7K3b!gX0`!etv+22vuB7M_9gUT#|MveD8mOr!E**cSdUs`NQ}$)yKH{yS;dQa0`pT+?{zAu{ z1NkM6ReimkFU+1XA37VBRVmIHc)U5KDsoo!!|$%HneV>lm(uW&u{mD&ejT%G0K?vX zDdOd&bCMF*z16v+J5#f1>6v4$)mOWEK5Gj)cQ@hw^}*b`vHq(?tG3+OklLQCZewq3 zzrRuY!NR!i>)lVyTvGF3)6IjY?c1xuLex^4&iTGO#&qCfr!%m5bN$@KPrV-TLc{8q zn+HECt7u+k!6;L)RTjk0_sYx{G4$3);GcZug=_m=y1nn z!8Zx|f3&vTnS(Zk78SM1%4YrZbH5Gma;IvdPc6<}6kc&(I@}nIav}Hje|WTIXw|TQ zet+-3=Jof_jzn^Xj`XzozjO4bmm7Pp&FYXjk1rAKT>uKNlm!KrZ^$GlyH!lmb`vA^ zSRJ791Oj!U$3apn84fZr#jH&uy4}_xf>>H3dQoOT4Gt}{g3Ty*GP&hhMyh-zrJ_ZN z2|~4p0035oBO#B~VsjB5jmV2jfOlSuh#;>Cw^Ad@H)KOvyOV)%F)l{oR1aG!5hVyA zwUagzIl8nF2r$x!R&bnyKoGavEp|)Ac4skysZ=Til^_xc3@l(*nT;bou+6oAhwx$O z7#HPa9UN=7K|CgDvX^igkqGFa(fF(mgJBHb<{DuE@PT+p2ZD)F#A-z*dbqgMQUEd% z(64&9jG#}E9L8lYaZ*fbDP!XnOoX7RF@Hyi)8b8srVz%$Sb?bv%!*B#GF@-T9`oQS zC}yn=uNNSDk|oEQ$H|%$8?W)EGcge0K88EVdNg;hF|aZi2%ViO;ltDGG$MX}g0@pE zP554ACX~i$9L5+-3FA0M!YYO`!%~%kHeoV_Qm&FrfYRGs9BHE%9twbqS%9O&FVM6fQF(;j?|GH13*y;PM}Hx!;KOtfl3Lf zJRU;{bb`H|X3b^)%bIT=NbOtn4AuqaFY}6gJ(bI>@{N2$3+rtr2=cZCK~laHTx2Oj zd*cLHJ{7fsv=uX8{}?IQQ91i7#h}0_lUae2FpioeFm6IASf!FNu*8Jn6it~-l)^{S z7`n@D=G>%{NiGIF0JC45hS0D*?WE8jrg0OD> z^4l68HV+5`IlUn@a4;w=)PLcRb@7jY=$c-aY|QVvl?VO>fS$zHE`HYWuBG>bnz%Zf z_V7SK>|n_G^za$$x9!@R{C8z=F#7SP=dJ`NrKeL(9#tE0sQG#Xd*}JgSE}-~b8AC? zO40>h*ykU#feV|nB+u`xYTx6v2V-hGDq6Pn<`7>;71q|j@hCB9_tS~e>YVEHHIFT7~^4UeT^|8zQ)@Nlr|MQoZcHTSJcmBKko+nz& W51pTEd9e|sD$u89>Gr2AU-w^7I7~1A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_empty.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..40e8ac5216186918389147a014046b6e454f32cf GIT binary patch literal 4405 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/default.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..d52aceaf5b13f21bb46feabc481fb2d1e7fb0026 GIT binary patch literal 2082 zcmV+-2;KLIP)Tc-8*xCD(aUsw|DN{`DVU3=gi!hQ%?VJ{4ap^FSmY?qf;-HIoBu=Ah)^z zAT9iVx|kM&8bh5MeG6U-O=a z2+ow?z(6KVlrm`9@At%Yc1hC=8tq-_JU7I>F4SVc*SBR58mLHE zqrYsnyy6}r(2m==Fs*?3YlZj?3#~wmE0Lki?^ytlFIi*I!8W49n~CnkgbUmx*?{I$ zjCP+kXkV-KUKk>v-VG}ZDfpMyL>ol>A;CS@BswVWw>23uHjyH~Cjpq8Ob}U}2k~4G zn$|taWf|TJSOkZk?9ST*&?5!_BH(`aX)zGux#P}oJKbYj0E>aq z`Sb$OCocvk0`ng@FFLoFq?PUYe3bUSTJZ+S8;Di;+u zS!G{!_tTaIar)?6>k5Dz@9jKch${t#x6cx-OCr!&F1T$~r4+q~Eb&{#y(|}P+f<*H z?zpMmTisI%0QJxOX2_8r5Tn~TuUB+3Ni%0zoyO>Ip|})d5fyidLQM%W>z~1*8bnPscVs zBHwxa>`-oHqZpbj`Nq;EgQ8=mGsmM-on(o?7SL&n<9=slW6TqONdeAvBxu9aCUM2J zskjq`IS5)&I8N(bisN^12fygNT0(6)-g&Ab_{?8;J$TL{)l_!FDXEEH96#5 zhCsBtZ6f;OUPfg5y#d$n{32FGG-F0CkN?B1l~Q;f0Nle09DcDb@ycIPfYtL&x?gKj zZH3|Z*#2Wgvl{w^`f(W#_8*H&zXvcvePdbiJ8?5czOnqNKFaltiF%)q{IEVucWn0H zgFB!cfe-fsSyQ@hATD4e5N%>k=Ye-$f$zno`X8*0Pt3_=HEO?210Tl%UWag?G{BEGlTR0bKe6fY{~$csY0~QEm<&K5zas8imd2<(^Y`EQ>3lK% zv>08iJl(SZ+Hpmc*OEGaNed`e39RD!J4mFCaAy}}$TXnhq$0`L{`H!MtQ)%Cy~j9j{r zowQuX1(gL@(J)SCfAR7lmcCI#S%B|;O4xJmgbyxGChdht_%R@8ex)5DT!)5=Kj-o= zcZ9;=_q-#7?Jz8XvBoYIgsQ8Pbn+KNt`dV50rjD70Q^{twYws|TndYFen*Ahvjt#^ zb2d4~^Pkm^4^zEue%C|V9Cm-%wRhz|!>+K`4Uj^35@0Gd!#)cLoBx5E27`t_0saL! z0(t^WcaA_|Zh(&*0e=Y+#h!&NLcsjN$ABD%;(9px&Rz`1^N;(rx<7SBR}4w=R&jq2z%~KHZMQG-G=CL zglrL7jRdvYjgh;w_lGEKTo4?!nc4Dx2mu`BHfg|D3~>MNKA8y5QW#(n+)Ggers?<=xRtP% z;u(Dl^t~k(RbIek++_NzLt6kolP{Jm5fwODy6~t@1->jmp2;IQsbHHb3dnRgVfMGi zV&n(D1i(i~R9PWYwE-C`y3iH?XYx1x?5BSM&=z;TfC_vEK{myx!C9iz?Qal#1wpa+ zv=<>Y&MwW~XUamI4teVfpT*qyX$gWdC!lILuPh2nV2-?1-#BUGFWo9+qc@+RasU7T M07*qoM6N<$g4CVXe*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json new file mode 100644 index 00000000000..a3da52233dd --- /dev/null +++ b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ai", + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.1 + ] + ] + }, + { + "name": "ai_dead" + }, + { + "name": "ai_empty", + "delays": [ + [ + 0.7, + 0.7 + ] + ] + }, + { + "name": "default", + "directions": 4 + }, + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/base.png b/Resources/Textures/Objects/Devices/ai_card.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..244183c078c3d580cda31d0431ced9150a7cf7c9 GIT binary patch literal 4432 zcmeHKdr%X19$$12&o1Gq!oMKz-D(7_8{4~yO6+) z8pPgtR!=;9jcu{E_-Ko?w#*HsqoUxz**PD0^`>XVO3|VRC)2ZMTfB0=4ezk_YavbVi1Qt58|_5Zu};9R*?@>4$wh z=VD74Sgi0dFcV;15ES^k$9^NK4U2sIC?>J$Kw?}6oBvjV_}FQFqkh1eDs#V9_5SI? z%X|X77b&~yI$332v$G{aUX}Xu^rdU<&(#&)zZ2cLx?i95HhSwpnQ?B<{ii>v-P4_4 z@a|UYcmFt$ySe?%H?Lku+O=}m!HiaIpDI>+?T+z$%eklGkI#MaT3Pw*vmdTJb2{tm zEeDG!+UMF|9PHS0{-&&KRpa;3niTilO^(9Ov!;RMU;J|E`s;>j`8o&+t7gq+yVYzS z%Liof>ZU!W>^6JMOKbCwW-d?chkI&{5T731Vc5Ss_FM+LqUnCoS6ykvT{ZR126^M0 zh%K@2%u`%yA)4h|KcBz-gX-EhUfvrh%qw2-MfJx+h6k^;ZF&@z@zEuR0EeA8#L)TH zQ}zu{$=;1b`W+jb$LcPjcW-}q=AXB}82a^2cg3wCA!@~v+OX6;hI3*Y(hb+$Y!WXG zwJ&&KUrdkCv#dIP@#fx^{;v|g+|f4c^3J$#`;8m76*N3N^;t*5Z%(vp+H*5MNiIxo zZt!*YG+ckB;l?vt$P@J^dz*7~e~8&%vnm{+wYlcRSZ7m7{lU(zimtY_yWePf|M=(U zWl0^g;_Zv@&4X#*n11zvG0|U}VJ#ZG@Tat;!B)i;_S1hqI_2@_K*Ji}(XSuxO2Hmk zE8jVuxjQ(R;@f!hTCeGIJ|b>Y*Ag?oIBlO@A$#C{Xv-|>jg5Oz`0~1`S5A2WY!;7PMD^Z4E(j9tBBrPDT;%_(0!5 zkTEUbBdHQbgq@6=^_q|eADu;DmNp^lbT-W9Gc(0(b|uf`SLQgV$`T5vk+f8~F+czS z4Hgh}!YZY1rhGquXay61FhmAb#BJwP& zMj^nP2`LsuAE8wG{eFdCqu_YAQibEV5>qSHY7|(YLWNf(1E^O>k|0JfEQ~<$tWRV) zFDzk_POeNeAqddJWAS->HrqJ7R~Tgh@SzNlKBY>5DLo$LWDh~iEC(Q?0sWwd-~dyq z%wq(ujHj5)a>gqrO@^SUaerSKUm8k>rj$%6;{m1uSXDJ;$tPZl5c@}gfSvol?35o_#E=)sfQ*bBhR2lTB76gYnDT+c} zIHlF-7_G+1=t595MXcg@4++Z2dPp~;^m*MOg+w@!Znv5cwE~-v*h@*#1suQ(uwI(; z3lk~_>tXUmQsPskS8Mbbj_Y-}TBXPF38NPnUI4u)p{g*2MjO&dg&{yXfLc=OQ~(f? zgKP*h&yXU=J2Kp=(+UOv`wtyJqN`76a2Vp6Rat8(s2= zk156r{sH;Hr_w7gHx7W$tZ?V*EDJO&{a!zPycS5F@MW(TAZT8@bcXF)F)slKBSfn$ zGomkYe&oWW+SN}4f#|W-lI|#Iql)6@Bqd^be_1?mW!P}1vC&muC-bd$yb2vrnx5Tm z>vYkBEB|wOurDkp>%E%NijA}0UV=djujRKYcFW$g$24sVy65y{yy z?Bi$Xg@=otJodf2p!`ts(KWN5?^{;$v*FxhmU~N5XJ^lmJw2;ZUenyMaJU^0eij|P z*GAz3=HT+&XW7WP#qn`bRac|q g&)vN>7n8?<1IlWm!V?ox>i`dsH8aQ3m{GL#zrOQGZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/empty.png b/Resources/Textures/Objects/Devices/ai_card.rsi/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..7e61f368de294ae506cdab73e818f0f594bb260c GIT binary patch literal 4292 zcmeHKeQ?v}8CR0!%Ui-=X$Wa^6QboSlVw?oE$b`-u?_LHPTj=Kpkqs9Np@5s%ScM> zWI!`$3Zq?tru1mLcC3R!*TBXKy_8S_Bs~~y(=7!$$_O;1(C)(EC~dl#mc6p`dF$OS zck6$#PnPt2{GR9ez0dQW-(PymmSh?74G;unxl5hp;0}XpVMZGG{rQu1d%^9kM&DAc zoQ=R?MGlCy0<1NJ1z3oR0SJnID0$Cib;94fHJDRy6x%RkJ^9M1EP72={qJ{NotfRC zSswf9^HoQrCikMZ{Rd8O%$7cEYiIL5Y00d+@txqwukO9;X6YZ-cU5J6@bH-*uKagK z*Zb$^&zadC^uIa#q5A6Bw3Ca?v-2-W^G=nQQq!JJW)3$WIIDbp?BJz4a;K;5d4-;H ztg34Ih2F|Tn@rbA)^;QLDJR+tJ?Blqr}~;n=?h|;GOg-F2UE~wwcoYu-O%M#4hTwG zCpsKnx5F`95Gdo@-E!tUO&r@yVN=*gUCHZM*?c=7>9L9T!QiXGcd^fdHz z7GM67=zr?Z52nmIo}BNUX_)F#|uh|PCEhX;i>u$OWYpsh=)!= zP?W-PFF^J7Y$CvY1b3YEaP4tpVCC`9PMNFI({no+M2}DNGAHtM z{IQ7SDJy3qP|7N>C`oc0$^sEeP$t4^4Fqu9VjctK4yhU&;shNEfEz`C!*f=%%|?(Y zVJ#w2lC%0ziX#Y==XeWiu@qT(KRX8EenkXb$<~g|N{8YB6i1N(jud#12o*p{fiQ!- zC_l>bCacBb=ZS!oi$n1oy;xQx7A&VIu|WX~hk|j1PB^{D>t+zM(KIUY*0NdvIDi=t zL%bYOM^!#i5-K!S=M%S@2`g^GNdhNHTM<5LR4FJb=tUhBHyH^suF)5U2IT;1S-n#M zKwJ*0p&g3AYO>;!OlY({65w!;l6whj`lhp(OYBH0wiK6i$A5PI`Gi}BTaT9GC zV=wb!py7X6>*E946N_Fdsvv$tT$Grp3Snj9E%90_#)k=p<6}XyT%rV(trz%so&YPM z;%eAXPyqYKP{R((#cyba0B^=AB0!;5oW(&i1Z*h9lSL@c2Pna6v9UHb(N81jsvOWF ztRgH50v-WZph4qY!E=X}YTo#4A~k}(4uCS$M4_XU5ePO^ET-=m!`0fc|Kh_QHyE?U z0KbF`Y+Ya{#74HlA-+Ja-{xm%9lp&FFgzJ#Li|qBHA&Zm7?_apWOq%{H6aEjWIWkj z|2Mh}qlYOW1pWadknc>o9DgqFrsh>KHm1~!0 z_MJYK_72f#zcVE-cB{$A zT&!7@oSNfZ_=^j<5OiqD^%n+{IzBec-QJXJus;ZGf8)FDdn%ue&1i1~p&_@c%(=Iu HdhLGz@YfZx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/full.png b/Resources/Textures/Objects/Devices/ai_card.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..59131c8c0aafc5f647d4409168265f23cc05e667 GIT binary patch literal 5121 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d3863145b951a7743066a59157c1cc7e562a50d GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FST zi(^Q|oVT|QavnAiaJeXd!mxBHL-@lzyJI3eW&X_#`)JO=0C5^IGT8Tx_t4~ zX@6Nl{8v5ulh<%-62mLgwUz6yO>>#Rwqw3njO^a1`qCRp_ZvjpV=T? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1704b9c3c112fc423e9466328df5e2bac1f15c87 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G3n zi(^Q|oVT|&@*Xk}alP2>ax#YJfu_-<Qq+r@Tz=cdWe;su{G zbQCijv1E88!%)cAV8QM%hgsnqqky@H!qP3Z{1Ny;?i_Y=X7}c^aI?Gd2{7O|KF>S%~kcJoh@js0_;4V~` bf53TkzSA$a-26*GpEG#6`njxgN@xNATZDFx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/meta.json b/Resources/Textures/Objects/Devices/ai_card.rsi/meta.json new file mode 100644 index 00000000000..8b8135fa16e --- /dev/null +++ b/Resources/Textures/Objects/Devices/ai_card.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "empty", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "full", + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..51a309d579ec0babdbdb117920c416e178e37599 GIT binary patch literal 777 zcmYk2dq`6O6vk(g4nv2%j4Ul*DZWTh!`IbqxvA+wd?bbTPz;7!*mS1LYZ6o-Dnw>Z z(HLfA?UK5N6W@~9%!x>ZyWQy@dElJGIh^zH<9l^8i{b8e-i<^e zxu-Gd*+lOmvX1OR)P@K5y-B2F^J(;yoT_$2BQH}YpFTdH)*O*dJ-am_gbWdr`zBktjW<{^8itBWe&P~yV146sa(nyVDz9T|4mJ2v5$fSYW`#yhmH9wv*!?&zGcvg*%qut)xX9S z>t1$sLdZ9NC58Es!%wye(tNxDhSH3bNFM~7SL#Ta~aGBsJb0AQ^lC|r2;F9 z7;S4q*z(Spzw4apJ>1FJu^s_Q7JjzzB;xf?+LrNEBRJr^y$Tz)xUG;7_-@6`%UDwA zn4maCCz%G|(Os)V%1s1SR))T(rdBp=C!=>@mfVVBMyN)kN9%!jFO#4q##qEr`+=%; z`VREOb#{TJN_TjLdMvWNX7U{VX-%F9`q!WzZfjC#DA%fi4y)3nr6fVa;U_TX|K{QP lKXoFrat0r{5DgqqcUW9ur=%6PVI|Wsr(MsYi>Y_({{hD)pQQi* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-full.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-full.png new file mode 100644 index 0000000000000000000000000000000000000000..03908b5284f4fd89c2ea79adc1227a271591a21b GIT binary patch literal 1746 zcmcJOeKb^Q7{JGOqpjhvO$n3Hu9UJzM`epE5lT&47D0*#GvP^WOJ8?|I+zJkRg>z2|pq z_n&8OV~)XK<^=}$?$phfb%Qa-RQLZmX5V5A#NcVjTENK)iLb@X3&mK}`X9XiY- z+=sX9ddB!IH+P|(;_j{>^D9Os+k%;k@CCWKLdGWUy5TFUuVwi%PiLg|nh1E8c2~8) zQZDTSM;^dTt4SPci*y);akQa`Mm`=_&z=Uu#M< zm%$o%(y#R^)u?5UX>|>_Y|;0tcJi|#FY1>HnZKjV2>pOGO_?-pj<+h!BNDXk*)6H? z5!`7Y6_jTW)ScR3U-70#92|SR3Z-Rg6?xUKy_jA1d&cR>Y12tGKq(MX=?32xJ`(>C z(c0o7!%-ip1%IltQcWkKCG50u#BI6k1M3-UO>x+%xMjD-upyzM<8Esy{8(uf z{;^b@4iA!Dx_PZ(Wn(!&5Pj0vwm8Fu>)VP}oSGzwh<$kC(dZXu6j5M7e+QySSGIY{ zHhNG7q9hFzUhJx)Uf*bUv!@yv^zjZ(72k;ORd89+`hX9w`+ z;Td1Bc{B&uj)qv>%upLQT2tEg3MkZvJfr8;M?7mGO<}r^km_#W$vNzKlvgWb0`grHl)vBjV?XN5Y_l~^CDVq*ht{-PD!io+8}4Wm*S1$HyoERj;FIsaJaJFm zY?%S1vZY#+P%XMOY4P|M?NB9K`C)hrU%ipFsZHCA=(U{v{O2N!=^T~VtR3nl0ZY)U zbd|xF(_|0s9B>_?dusv_Rh*BTq`XI^&r@}yano@59v8ohgvYm1{m|G*R>y~-BqSc~ zpL7%t^{8UfwCksg%7)8pVBvEnOd4Xzx@00a4^9?7BfY%gFlnI@`}*?J*5D5|A;)rV zD{WY=Zx!bq?yoQg=dsq2cJ|vnZrgCU`^%M zm$$A$j)enC`qz~s6LLF0Gz4MP8^tT{ z%F2`a<`O4*Zre9N@nrf`T<7mlRRy3=*S7egUBYn{kACL_)Frm6fw(G3ZXG_3jn;a6 zDIS_TlFcN;mPjsTrj$L~+Ln9#Q+x$>IM7Y3@7|2uqG$TtVDfyXUT03J9)?y_qL=s+ zgcVLvtdDR7!cg75T93Aa10TZW$IQg}To^(<;S)#$2TBMQvphaOIAazW+!j!#3jn&a z&vC*VHluS8MtU!4tvz#4Qkm*$=hDV#-|vBhL#ZzL-ay`38ZVf@n7*W%chZIYc$F>O;bH2m8MN0{tu|2u*vQx z#nPMPJau9TvY?^#sptg47j(kIx&k-7FR#(^>+Jj4E5PJSnw0-rw*2V-rnqD=YWB3V UyS=uT6R77J=(pXMjv*Cu-d=FzZ7>jFJ=nyn zvQXUf#{s8@n>goMn*W_`4pf|dD@}gh@juJ2|5aVObN_z-pW@6{7){ae)~DY-p1Xj+HA|+@=plM{%My0) zwSCu9*GrFHe&I(SSDz;Ayp+mxd+8Umj`uJ8OK>>Y3bKK%$(@S-T#Y-0@Ywq#$= z;m;oV{Cvvi(-Tm=RPqZp9|qW6ftXbM+1j%olg~E5djP@)crQTb1`IOb`PDVV>;Xaz zVDi%$P^%Za0SYyM$xmy*oZpAy2N}TNr#B!ru?7%P1IR1XfJ_Yl)BrW$+74@UVnV&j0`b07*qo IM6N<$f`|IS_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/output.rsi/meta.json b/Resources/Textures/Objects/Devices/output.rsi/meta.json new file mode 100644 index 00000000000..500ecb8e3e7 --- /dev/null +++ b/Resources/Textures/Objects/Devices/output.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", "states": [{"name": "aicard", "directions": 1, "delays": [[0.4, 0.4]]}, {"name": "aicard-full", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-full-unshaded", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-unshaded", "directions": 1, "delays": [[0.4, 0.4]]}]} \ No newline at end of file From c866ffb45fcadbc32cb6e7a739863fd51a74483b Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:05:39 +1000 Subject: [PATCH 02/23] Verb tweaks (#31309) * Verb tweaks Remove the LOS check because this is already done above in CanExamine. * Fix outlines * import --- .../Commands/SetMenuVisibilityCommand.cs | 1 + .../ContextMenu/UI/EntityMenuUIController.cs | 19 ++++++-- Content.Client/Verbs/VerbSystem.cs | 45 ++++--------------- Content.Shared/Verbs/SharedVerbSystem.cs | 24 ++++++++++ 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/Content.Client/Commands/SetMenuVisibilityCommand.cs b/Content.Client/Commands/SetMenuVisibilityCommand.cs index ddfb0b16920..17a544dabaf 100644 --- a/Content.Client/Commands/SetMenuVisibilityCommand.cs +++ b/Content.Client/Commands/SetMenuVisibilityCommand.cs @@ -1,4 +1,5 @@ using Content.Client.Verbs; +using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.Console; diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs index a60619baa35..b6f4dc1be2a 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs @@ -9,6 +9,7 @@ using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Input; +using Content.Shared.Verbs; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; @@ -194,8 +195,20 @@ public override void FrameUpdate(FrameEventArgs args) return; // Do we need to do in-range unOccluded checks? - var ignoreFov = !_eyeManager.CurrentEye.DrawFov || - (_verbSystem.Visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov; + var visibility = _verbSystem.Visibility; + + if (!_eyeManager.CurrentEye.DrawFov) + { + visibility &= ~MenuVisibility.NoFov; + } + + var ev = new MenuVisibilityEvent() + { + Visibility = visibility, + }; + + _entityManager.EventBus.RaiseLocalEvent(player, ref ev); + visibility = ev.Visibility; _entityManager.TryGetComponent(player, out ExaminerComponent? examiner); var xformQuery = _entityManager.GetEntityQuery(); @@ -209,7 +222,7 @@ public override void FrameUpdate(FrameEventArgs args) continue; } - if (ignoreFov) + if ((visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov) continue; var pos = new MapCoordinates(_xform.GetWorldPosition(xform, xformQuery), xform.MapID); diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index 2513210e2cc..e28f48d6a50 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -67,6 +67,14 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true ? Visibility : Visibility | MenuVisibility.NoFov; + var ev = new MenuVisibilityEvent() + { + TargetPos = targetPos, + Visibility = visibility, + }; + + RaiseLocalEvent(player.Value, ref ev); + visibility = ev.Visibility; // Get entities List entities; @@ -78,13 +86,8 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true var entitiesUnderMouse = gameScreenBase.GetClickableEntities(targetPos).ToHashSet(); bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e); - // first check the general location. - if (!_examine.CanExamine(player.Value, targetPos, Predicate)) - return false; - TryComp(player.Value, out ExaminerComponent? examiner); - // Then check every entity entities = new(); foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize, flags: examineFlags)) { @@ -138,27 +141,6 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true } } - // Remove any entities that do not have LOS - if ((visibility & MenuVisibility.NoFov) == 0) - { - var xformQuery = GetEntityQuery(); - var playerPos = _transform.GetMapCoordinates(player.Value, xform: xformQuery.GetComponent(player.Value)); - - for (var i = entities.Count - 1; i >= 0; i--) - { - var entity = entities[i]; - - if (!_examine.InRangeUnOccluded( - playerPos, - _transform.GetMapCoordinates(entity, xform: xformQuery.GetComponent(entity)), - ExamineSystemShared.ExamineRange, - null)) - { - entities.RemoveSwap(i); - } - } - } - if (entities.Count == 0) return false; @@ -230,15 +212,4 @@ private void HandleVerbResponse(VerbsResponseEvent msg) OnVerbsResponse?.Invoke(msg); } } - - [Flags] - public enum MenuVisibility - { - // What entities can a user see on the entity menu? - Default = 0, // They can only see entities in FoV. - NoFov = 1 << 0, // They ignore FoV restrictions - InContainer = 1 << 1, // They can see through containers. - Invisible = 1 << 2, // They can see entities without sprites and the "HideContextMenu" tag is ignored. - All = NoFov | InContainer | Invisible - } } diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index c3f906f2936..37840dcbb54 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Interaction; using Content.Shared.Inventory.VirtualItem; using Robust.Shared.Containers; +using Robust.Shared.Map; namespace Content.Shared.Verbs { @@ -174,4 +175,27 @@ public virtual void ExecuteVerb(Verb verb, EntityUid user, EntityUid target, boo _interactionSystem.DoContactInteraction(user, target); } } + + // Does nothing on server + ///

+ /// Raised directed when trying to get the entity menu visibility for entities. + /// + [ByRefEvent] + public record struct MenuVisibilityEvent + { + public MapCoordinates TargetPos; + public MenuVisibility Visibility; + } + + // Does nothing on server + [Flags] + public enum MenuVisibility + { + // What entities can a user see on the entity menu? + Default = 0, // They can only see entities in FoV. + NoFov = 1 << 0, // They ignore FoV restrictions + InContainer = 1 << 1, // They can see through containers. + Invisible = 1 << 2, // They can see entities without sprites and the "HideContextMenu" tag is ignored. + All = NoFov | InContainer | Invisible + } } From d6b0b997c0b89a17409782198f80dc9cd95897e1 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:30:28 +1000 Subject: [PATCH 03/23] ItemToggle + slots stuff (#31312) * ItemToggle + slots stuff - Add component for itemslot locks to match LockComponent (surprised this didn't exist). - Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first. * Also this * grill --- .../ItemSlot/ItemSlotsLockComponent.cs | 13 ++++++ .../ItemSlot/ItemSlotsSystem.Lock.cs | 36 +++++++++++++++++ .../Containers/ItemSlot/ItemSlotsSystem.cs | 4 +- .../Components/ItemToggleComponent.cs | 12 +++--- .../Item/ItemToggle/ItemToggleSystem.cs | 40 ++++++++++++++----- .../ItemTogglePointLightComponent.cs | 12 ++++++ .../ItemTogglePointLightSystem.cs | 29 ++++++++++++++ .../ItemSlotRequiresPowerComponent.cs | 9 +++++ .../ItemSlotRequiresPowerSystem.cs | 23 +++++++++++ Resources/Locale/en-US/items/toggle.ftl | 2 + 10 files changed, 163 insertions(+), 17 deletions(-) create mode 100644 Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs create mode 100644 Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs create mode 100644 Content.Shared/Light/Components/ItemTogglePointLightComponent.cs create mode 100644 Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs create mode 100644 Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs create mode 100644 Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs create mode 100644 Resources/Locale/en-US/items/toggle.ftl diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs new file mode 100644 index 00000000000..0d8901028d7 --- /dev/null +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Containers.ItemSlots; + +/// +/// Updates the relevant ItemSlots locks based on +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ItemSlotsLockComponent : Component +{ + [DataField(required: true)] + public List Slots = new(); +} diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs new file mode 100644 index 00000000000..ee5178df95b --- /dev/null +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs @@ -0,0 +1,36 @@ +using Content.Shared.Lock; + +namespace Content.Shared.Containers.ItemSlots; + +public sealed partial class ItemSlotsSystem +{ + private void InitializeLock() + { + SubscribeLocalEvent(OnLockMapInit); + SubscribeLocalEvent(OnLockToggled); + } + + private void OnLockMapInit(Entity ent, ref MapInitEvent args) + { + if (!TryComp(ent.Owner, out LockComponent? lockComp)) + return; + + UpdateLocks(ent, lockComp.Locked); + } + + private void OnLockToggled(Entity ent, ref LockToggledEvent args) + { + UpdateLocks(ent, args.Locked); + } + + private void UpdateLocks(Entity ent, bool value) + { + foreach (var slot in ent.Comp.Slots) + { + if (!TryGetSlot(ent.Owner, slot, out var itemSlot)) + continue; + + SetLock(ent.Owner, itemSlot, value); + } + } +} diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index c8745d17d49..4fe49a6382e 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -26,7 +26,7 @@ namespace Content.Shared.Containers.ItemSlots /// Note when using popups on entities with many slots with InsertOnInteract, EjectOnInteract or EjectOnUse: /// A single use will try to insert to/eject from every slot and generate a popup for each that fails. /// - public sealed class ItemSlotsSystem : EntitySystem + public sealed partial class ItemSlotsSystem : EntitySystem { [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; @@ -43,6 +43,8 @@ public override void Initialize() { base.Initialize(); + InitializeLock(); + SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(Oninitialize); diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs index 46249fdd0de..47edec135d8 100644 --- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs +++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs @@ -19,6 +19,12 @@ public sealed partial class ItemToggleComponent : Component [DataField, AutoNetworkedField] public bool Activated = false; + /// + /// Can the entity be activated in the world. + /// + [DataField] + public bool OnActivate = true; + /// /// If this is set to false then the item can't be toggled by pressing Z. /// Use another system to do it then. @@ -52,12 +58,6 @@ public sealed partial class ItemToggleComponent : Component /// [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public SoundSpecifier? SoundFailToActivate; - - /// - /// Whether or not to toggle the entity's lights on or off. - /// - [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] - public bool ToggleLight = true; } /// diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs index c4e4150659b..044a1109a18 100644 --- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Popups; @@ -5,6 +6,7 @@ using Content.Shared.Temperature; using Content.Shared.Throwing; using Content.Shared.Toggleable; +using Content.Shared.Verbs; using Content.Shared.Wieldable; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; @@ -23,7 +25,6 @@ public sealed class ItemToggleSystem : EntitySystem [Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; public override void Initialize() @@ -35,6 +36,8 @@ public override void Initialize() SubscribeLocalEvent(TurnOffOnUnwielded); SubscribeLocalEvent(TurnOnOnWielded); SubscribeLocalEvent(OnUseInHand); + SubscribeLocalEvent>(OnActivateVerb); + SubscribeLocalEvent(OnActivate); SubscribeLocalEvent(OnIsHotEvent); @@ -67,6 +70,32 @@ private void OnUseInHand(Entity ent, ref UseInHandEvent arg Toggle((ent, ent.Comp), args.User, predicted: ent.Comp.Predictable); } + private void OnActivateVerb(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract) + return; + + var user = args.User; + + args.Verbs.Add(new ActivationVerb() + { + Text = !ent.Comp.Activated ? Loc.GetString("item-toggle-activate") : Loc.GetString("item-toggle-deactivate"), + Act = () => + { + Toggle((ent.Owner, ent.Comp), user, predicted: ent.Comp.Predictable); + } + }); + } + + private void OnActivate(Entity ent, ref ActivateInWorldEvent args) + { + if (args.Handled || !ent.Comp.OnActivate) + return; + + args.Handled = true; + Toggle((ent.Owner, ent.Comp), args.User, predicted: ent.Comp.Predictable); + } + /// /// Used when an item is attempted to be toggled. /// Sets its state to the opposite of what it is. @@ -204,16 +233,7 @@ private void UpdateVisuals(Entity ent) if (TryComp(ent, out AppearanceComponent? appearance)) { _appearance.SetData(ent, ToggleVisuals.Toggled, ent.Comp.Activated, appearance); - - if (ent.Comp.ToggleLight) - _appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated, appearance); } - - if (!ent.Comp.ToggleLight) - return; - - if (_light.TryGetLight(ent, out var light)) - _light.SetEnabled(ent, ent.Comp.Activated, light); } /// diff --git a/Content.Shared/Light/Components/ItemTogglePointLightComponent.cs b/Content.Shared/Light/Components/ItemTogglePointLightComponent.cs new file mode 100644 index 00000000000..6ac1bf236d7 --- /dev/null +++ b/Content.Shared/Light/Components/ItemTogglePointLightComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +/// +/// Toggles point light on an entity whenever ItemToggle hits. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ItemTogglePointLightComponent : Component +{ + +} diff --git a/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs b/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs new file mode 100644 index 00000000000..7030c538c1d --- /dev/null +++ b/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs @@ -0,0 +1,29 @@ +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Toggleable; +using ItemTogglePointLightComponent = Content.Shared.Light.Components.ItemTogglePointLightComponent; + +namespace Content.Shared.Light.EntitySystems; + +/// +/// Handles ItemToggle for PointLight +/// +public sealed class ItemTogglePointLightSystem : EntitySystem +{ + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedPointLightSystem _light = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnLightToggled); + } + + private void OnLightToggled(Entity ent, ref ItemToggledEvent args) + { + if (!_light.TryGetLight(ent.Owner, out var light)) + return; + + _appearance.SetData(ent, ToggleableLightVisuals.Enabled, args.Activated); + _light.SetEnabled(ent.Owner, args.Activated, comp: light); + } +} diff --git a/Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs b/Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs new file mode 100644 index 00000000000..6e3b9eaca05 --- /dev/null +++ b/Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Power.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class ItemSlotRequiresPowerComponent : Component +{ + +} diff --git a/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs b/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs new file mode 100644 index 00000000000..3df8b91a985 --- /dev/null +++ b/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs @@ -0,0 +1,23 @@ +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Power.Components; + +namespace Content.Shared.Power.EntitySystems; + +public sealed class ItemSlotRequiresPowerSystem : EntitySystem +{ + [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInsertAttempt); + } + + private void OnInsertAttempt(Entity ent, ref ItemSlotInsertAttemptEvent args) + { + if (!_receiver.IsPowered(ent.Owner)) + { + args.Cancelled = true; + } + } +} diff --git a/Resources/Locale/en-US/items/toggle.ftl b/Resources/Locale/en-US/items/toggle.ftl new file mode 100644 index 00000000000..bcf5c161a6f --- /dev/null +++ b/Resources/Locale/en-US/items/toggle.ftl @@ -0,0 +1,2 @@ +item-toggle-activate = Activate +item-toggle-deactivate = Deactivate From 56451fa5e7fd9910cf38d27e5cc0800bd71b9a2f Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Wed, 19 Jun 2024 02:30:41 +1200 Subject: [PATCH 04/23] Station AI (#30944) * Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes --- Content.Client/Interaction/DragDropSystem.cs | 2 +- .../ReplaySpectatorSystem.Blockers.cs | 7 +++- .../ActionBlocker/ActionBlockerSystem.cs | 6 ++-- .../Administration/SharedAdminFrozenSystem.cs | 8 ++++- Content.Shared/Cuffs/SharedCuffableSystem.cs | 8 ++++- Content.Shared/Ghost/SharedGhostSystem.cs | 8 ++++- .../Events/InteractionAttemptEvent.cs | 34 ++++++++----------- .../SharedInteractionSystem.Blocking.cs | 8 ++++- .../Systems/MobStateSystem.Subscribers.cs | 13 ++++++- .../Puppet/SharedVentriloquistPuppetSystem.cs | 10 ++++-- Content.Shared/Stunnable/SharedStunSystem.cs | 7 ++-- .../SubFloor/SharedSubFloorHideSystem.cs | 4 +-- 12 files changed, 79 insertions(+), 36 deletions(-) diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs index 8baa4d15fe4..d249766bbcc 100644 --- a/Content.Client/Interaction/DragDropSystem.cs +++ b/Content.Client/Interaction/DragDropSystem.cs @@ -495,7 +495,7 @@ private void RemoveHighlights() // CanInteract() doesn't support checking a second "target" entity. // Doing so manually: var ev = new GettingInteractedWithAttemptEvent(user, dragged); - RaiseLocalEvent(dragged, ev, true); + RaiseLocalEvent(dragged, ref ev); if (ev.Cancelled) return false; diff --git a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs index 2fa862f3df7..99d85350b5e 100644 --- a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs +++ b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs @@ -17,7 +17,7 @@ private void InitializeBlockers() SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); - SubscribeLocalEvent(OnAttempt); + SubscribeLocalEvent(OnInteractAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); @@ -27,6 +27,11 @@ private void InitializeBlockers() SubscribeLocalEvent(OnPullAttempt); } + private void OnInteractAttempt(Entity ent, ref InteractionAttemptEvent args) + { + args.Cancelled = true; + } + private void OnAttempt(EntityUid uid, ReplaySpectatorComponent component, CancellableEntityEventArgs args) { args.Cancel(); diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index bd6ee8cae1e..457e3875d47 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -89,7 +89,7 @@ public bool CanInteract(EntityUid user, EntityUid? target) return false; var ev = new InteractionAttemptEvent(user, target); - RaiseLocalEvent(user, ev); + RaiseLocalEvent(user, ref ev); if (ev.Cancelled) return false; @@ -98,7 +98,7 @@ public bool CanInteract(EntityUid user, EntityUid? target) return true; var targetEv = new GettingInteractedWithAttemptEvent(user, target); - RaiseLocalEvent(target.Value, targetEv); + RaiseLocalEvent(target.Value, ref targetEv); return !targetEv.Cancelled; } @@ -129,7 +129,7 @@ public bool CanUseHeldEntity(EntityUid user, EntityUid used) public bool CanConsciouslyPerformAction(EntityUid user) { var ev = new ConsciousAttemptEvent(user); - RaiseLocalEvent(user, ev); + RaiseLocalEvent(user, ref ev); return !ev.Cancelled; } diff --git a/Content.Shared/Administration/SharedAdminFrozenSystem.cs b/Content.Shared/Administration/SharedAdminFrozenSystem.cs index 2fa22e00052..259df2bdf2a 100644 --- a/Content.Shared/Administration/SharedAdminFrozenSystem.cs +++ b/Content.Shared/Administration/SharedAdminFrozenSystem.cs @@ -11,6 +11,7 @@ namespace Content.Shared.Administration; +// TODO deduplicate with BlockMovementComponent public abstract class SharedAdminFrozenSystem : EntitySystem { [Dependency] private readonly ActionBlockerSystem _blocker = default!; @@ -23,7 +24,7 @@ public override void Initialize() SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); - SubscribeLocalEvent(OnAttempt); + SubscribeLocalEvent(OnInteractAttempt); SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(UpdateCanMove); SubscribeLocalEvent(OnUpdateCanMove); @@ -34,6 +35,11 @@ public override void Initialize() SubscribeLocalEvent(OnSpeakAttempt); } + private void OnInteractAttempt(Entity ent, ref InteractionAttemptEvent args) + { + args.Cancelled = true; + } + private void OnSpeakAttempt(EntityUid uid, AdminFrozenComponent component, SpeakAttemptEvent args) { if (!component.Muted) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 1c8e2ef2b0d..dbc2ba06c93 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -84,7 +84,7 @@ public override void Initialize() SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); - SubscribeLocalEvent(CheckAct); + SubscribeLocalEvent(CheckInteract); SubscribeLocalEvent(OnCuffAfterInteract); SubscribeLocalEvent(OnCuffMeleeHit); @@ -92,6 +92,12 @@ public override void Initialize() SubscribeLocalEvent(OnCuffVirtualItemDeleted); } + private void CheckInteract(Entity ent, ref InteractionAttemptEvent args) + { + if (!ent.Comp.CanStillInteract) + args.Cancelled = true; + } + private void OnUncuffAttempt(ref UncuffAttemptEvent args) { if (args.Cancelled) diff --git a/Content.Shared/Ghost/SharedGhostSystem.cs b/Content.Shared/Ghost/SharedGhostSystem.cs index 6f7370fe581..091775b6c2e 100644 --- a/Content.Shared/Ghost/SharedGhostSystem.cs +++ b/Content.Shared/Ghost/SharedGhostSystem.cs @@ -20,13 +20,19 @@ public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnAttempt); - SubscribeLocalEvent(OnAttempt); + SubscribeLocalEvent(OnAttemptInteract); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); } + private void OnAttemptInteract(Entity ent, ref InteractionAttemptEvent args) + { + if (!ent.Comp.CanGhostInteract) + args.Cancelled = true; + } + private void OnAttempt(EntityUid uid, GhostComponent component, CancellableEntityEventArgs args) { if (!component.CanGhostInteract) diff --git a/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs b/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs index 0024811c369..a04c0536354 100644 --- a/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs +++ b/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs @@ -3,39 +3,33 @@ /// /// Event raised directed at a user to see if they can perform a generic interaction. /// - public sealed class InteractionAttemptEvent : CancellableEntityEventArgs + [ByRefEvent] + public struct InteractionAttemptEvent(EntityUid uid, EntityUid? target) { - public InteractionAttemptEvent(EntityUid uid, EntityUid? target) - { - Uid = uid; - Target = target; - } - - public EntityUid Uid { get; } - public EntityUid? Target { get; } + public bool Cancelled; + public readonly EntityUid Uid = uid; + public readonly EntityUid? Target = target; } /// /// Raised to determine whether an entity is conscious to perform an action. /// - public sealed class ConsciousAttemptEvent(EntityUid Uid) : CancellableEntityEventArgs + [ByRefEvent] + public struct ConsciousAttemptEvent(EntityUid uid) { - public EntityUid Uid { get; } = Uid; + public bool Cancelled; + public readonly EntityUid Uid = uid; } /// /// Event raised directed at the target entity of an interaction to see if the user is allowed to perform some /// generic interaction. /// - public sealed class GettingInteractedWithAttemptEvent : CancellableEntityEventArgs + [ByRefEvent] + public struct GettingInteractedWithAttemptEvent(EntityUid uid, EntityUid? target) { - public GettingInteractedWithAttemptEvent(EntityUid uid, EntityUid? target) - { - Uid = uid; - Target = target; - } - - public EntityUid Uid { get; } - public EntityUid? Target { get; } + public bool Cancelled; + public readonly EntityUid Uid = uid; + public readonly EntityUid? Target = target; } } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs index 9a84789adfc..a682bf98159 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs @@ -6,6 +6,7 @@ namespace Content.Shared.Interaction; +// TODO deduplicate with AdminFrozenComponent /// /// Handles , which prevents various /// kinds of movement and interactions when attached to an entity. @@ -16,7 +17,7 @@ public void InitializeBlocking() { SubscribeLocalEvent(OnMoveAttempt); SubscribeLocalEvent(CancelEvent); - SubscribeLocalEvent(CancelEvent); + SubscribeLocalEvent(CancelInteractEvent); SubscribeLocalEvent(CancelEvent); SubscribeLocalEvent(CancelEvent); SubscribeLocalEvent(CancelEvent); @@ -25,6 +26,11 @@ public void InitializeBlocking() SubscribeLocalEvent(OnBlockingShutdown); } + private void CancelInteractEvent(Entity ent, ref InteractionAttemptEvent args) + { + args.Cancelled = true; + } + private void OnMoveAttempt(EntityUid uid, BlockMovementComponent component, UpdateCanMoveEvent args) { if (component.LifeStage > ComponentLifeStage.Running) diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index a467c893643..f5acced4db0 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -33,7 +33,7 @@ private void SubscribeEvents() SubscribeLocalEvent(OnDirectionAttempt); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); - SubscribeLocalEvent(CheckAct); + SubscribeLocalEvent(CheckConcious); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(OnSpeakAttempt); SubscribeLocalEvent(OnEquipAttempt); @@ -91,6 +91,17 @@ private void OnUnbuckleAttempt(Entity ent, ref UnbuckleAttemp args.Cancelled = true; } + private void CheckConcious(Entity ent, ref ConsciousAttemptEvent args) + { + switch (ent.Comp.CurrentState) + { + case MobState.Dead: + case MobState.Critical: + args.Cancelled = true; + break; + } + } + private void OnStateExitSubscribers(EntityUid target, MobStateComponent component, MobState state) { switch (state) diff --git a/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs b/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs index 430c2b1b17d..e3fa21ed377 100644 --- a/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs +++ b/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs @@ -7,6 +7,7 @@ namespace Content.Shared.Puppet; +// TODO deduplicate with BlockMovementComponent public abstract class SharedVentriloquistPuppetSystem : EntitySystem { [Dependency] private readonly ActionBlockerSystem _blocker = default!; @@ -15,7 +16,7 @@ public override void Initialize() { base.Initialize(); SubscribeLocalEvent(Cancel); - SubscribeLocalEvent(Cancel); + SubscribeLocalEvent(CancelInteract); SubscribeLocalEvent(Cancel); SubscribeLocalEvent(Cancel); SubscribeLocalEvent(Cancel); @@ -24,6 +25,11 @@ public override void Initialize() SubscribeLocalEvent(OnStartup); } + private void CancelInteract(Entity ent, ref InteractionAttemptEvent args) + { + args.Cancelled = true; + } + private void OnStartup(EntityUid uid, VentriloquistPuppetComponent component, ComponentStartup args) { _blocker.UpdateCanMove(uid); @@ -33,4 +39,4 @@ private void Cancel(EntityUid uid, VentriloquistPuppetComponent component, T { args.Cancel(); } -} \ No newline at end of file +} diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs index 9d2e8d3dde2..be5630cea07 100644 --- a/Content.Shared/Stunnable/SharedStunSystem.cs +++ b/Content.Shared/Stunnable/SharedStunSystem.cs @@ -68,7 +68,7 @@ public override void Initialize() // Attempt event subscriptions. SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnMoveAttempt); - SubscribeLocalEvent(OnAttempt); + SubscribeLocalEvent(OnAttemptInteract); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); SubscribeLocalEvent(OnAttempt); @@ -79,7 +79,10 @@ public override void Initialize() SubscribeLocalEvent(OnMobStateChanged); } - + private void OnAttemptInteract(Entity ent, ref InteractionAttemptEvent args) + { + args.Cancelled = true; + } private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobStateChangedEvent args) { diff --git a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs index ba78ff651f5..cebc84ecb93 100644 --- a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs +++ b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs @@ -45,11 +45,11 @@ private void OnAttackAttempt(EntityUid uid, SubFloorHideComponent component, ref args.Cancelled = true; } - private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, GettingInteractedWithAttemptEvent args) + private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, ref GettingInteractedWithAttemptEvent args) { // No interactions with entities hidden under floor tiles. if (component.BlockInteractions && component.IsUnderCover) - args.Cancel(); + args.Cancelled = true; } private void OnSubFloorStarted(EntityUid uid, SubFloorHideComponent component, ComponentStartup _) From bdafdeb7052aefa6e0f749f2e04c28bf33a78f4b Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Thu, 13 Jun 2024 22:15:29 -0400 Subject: [PATCH 05/23] Move SleepingSystem to Shared & cleanup (#28672) * Move SleepingSystem to Shared & cleanup * Remove empty OnShutdown handler --- Content.Client/Bed/SleepingSystem.cs | 8 - Content.Server/Bed/BedSystem.cs | 1 - Content.Server/Bed/Sleep/SleepingSystem.cs | 261 --------------- .../Damage/ForceSay/DamageForceSaySystem.cs | 1 + .../Bed/Sleep/SharedSleepingSystem.cs | 102 ------ Content.Shared/Bed/Sleep/SleepingComponent.cs | 31 +- Content.Shared/Bed/Sleep/SleepingSystem.cs | 314 ++++++++++++++++++ .../Bed/Sleep}/SnoringComponent.cs | 6 +- 8 files changed, 340 insertions(+), 384 deletions(-) delete mode 100644 Content.Client/Bed/SleepingSystem.cs delete mode 100644 Content.Server/Bed/Sleep/SleepingSystem.cs delete mode 100644 Content.Shared/Bed/Sleep/SharedSleepingSystem.cs create mode 100644 Content.Shared/Bed/Sleep/SleepingSystem.cs rename {Content.Server/Bed/Components => Content.Shared/Bed/Sleep}/SnoringComponent.cs (54%) diff --git a/Content.Client/Bed/SleepingSystem.cs b/Content.Client/Bed/SleepingSystem.cs deleted file mode 100644 index addf855bf36..00000000000 --- a/Content.Client/Bed/SleepingSystem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Server.Bed.Sleep; - -namespace Content.Client.Bed; - -public sealed class SleepingSystem : SharedSleepingSystem -{ - -} diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs index 2335859f0b8..7220c04ea8c 100644 --- a/Content.Server/Bed/BedSystem.cs +++ b/Content.Server/Bed/BedSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Actions; using Content.Server.Bed.Components; -using Content.Server.Bed.Sleep; using Content.Server.Body.Systems; using Content.Server.Construction; using Content.Server.Power.Components; diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs deleted file mode 100644 index 47966c4814f..00000000000 --- a/Content.Server/Bed/Sleep/SleepingSystem.cs +++ /dev/null @@ -1,261 +0,0 @@ -using Content.Server.Popups; -using Content.Server.Sound; -using Content.Shared.Sound.Components; -using Content.Shared.Actions; -using Content.Shared.Audio; -using Content.Shared.Bed.Sleep; -using Content.Shared.Damage; -using Content.Shared.Examine; -using Content.Shared.IdentityManagement; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Components; -using Content.Shared.Slippery; -using Content.Shared.StatusEffect; -using Content.Shared.Stunnable; -using Content.Shared.Verbs; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Robust.Shared.Timing; - -namespace Content.Server.Bed.Sleep -{ - public sealed class SleepingSystem : SharedSleepingSystem - { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly EmitSoundSystem _emitSound = default!; - - [ValidatePrototypeId] public const string SleepActionId = "ActionSleep"; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnSleepStateChanged); - SubscribeLocalEvent(OnDamageChanged); - SubscribeLocalEvent(OnSleepAction); - SubscribeLocalEvent(OnBedSleepAction); - SubscribeLocalEvent(OnWakeAction); - SubscribeLocalEvent(OnMobStateChanged); - SubscribeLocalEvent>(AddWakeVerb); - SubscribeLocalEvent(OnInteractHand); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnSlip); - SubscribeLocalEvent(OnConsciousAttempt); - SubscribeLocalEvent(OnInit); - } - - /// - /// when sleeping component is added or removed, we do some stuff with other components. - /// - private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, SleepStateChangedEvent args) - { - if (args.FellAsleep) - { - // Expiring status effects would remove the components needed for sleeping - _statusEffectsSystem.TryRemoveStatusEffect(uid, "Stun"); - _statusEffectsSystem.TryRemoveStatusEffect(uid, "KnockedDown"); - - EnsureComp(uid); - EnsureComp(uid); - - if (TryComp(uid, out var sleepSound)) - { - var emitSound = EnsureComp(uid); - if (HasComp(uid)) - { - emitSound.Sound = sleepSound.Snore; - } - emitSound.MinInterval = sleepSound.Interval; - emitSound.MaxInterval = sleepSound.MaxInterval; - emitSound.PopUp = sleepSound.PopUp; - } - - return; - } - - RemComp(uid); - RemComp(uid); - RemComp(uid); - } - - /// - /// Wake up on taking an instance of damage at least the value of WakeThreshold. - /// - private void OnDamageChanged(EntityUid uid, SleepingComponent component, DamageChangedEvent args) - { - if (!args.DamageIncreased || args.DamageDelta == null) - return; - - /* Shitmed Change Start - Surgery needs this, sorry! If the nocturine gamers get too feisty - I'll probably just increase the threshold */ - - if (args.DamageDelta.GetTotal() >= component.WakeThreshold - && !HasComp(uid)) - TryWaking(uid, component); - - // Shitmed Change End - - } - - private void OnSleepAction(EntityUid uid, MobStateComponent component, SleepActionEvent args) - { - TrySleeping(uid); - } - - private void OnBedSleepAction(EntityUid uid, ActionsContainerComponent component, SleepActionEvent args) - { - TrySleeping(args.Performer); - } - - private void OnWakeAction(EntityUid uid, MobStateComponent component, WakeActionEvent args) - { - if (!TryWakeCooldown(uid)) - return; - - if (TryWaking(uid)) - args.Handled = true; - } - - /// - /// In crit, we wake up if we are not being forced to sleep. - /// And, you can't sleep when dead... - /// - private void OnMobStateChanged(EntityUid uid, SleepingComponent component, MobStateChangedEvent args) - { - if (args.NewMobState == MobState.Dead) - { - RemComp(uid); - RemComp(uid); - return; - } - if (TryComp(uid, out var spam)) - _emitSound.SetEnabled((uid, spam), args.NewMobState == MobState.Alive); - } - - private void AddWakeVerb(EntityUid uid, SleepingComponent component, GetVerbsEvent args) - { - if (!args.CanInteract || !args.CanAccess) - return; - - AlternativeVerb verb = new() - { - Act = () => - { - if (!TryWakeCooldown(uid)) - return; - - TryWaking(args.Target, user: args.User); - }, - Text = Loc.GetString("action-name-wake"), - Priority = 2 - }; - - args.Verbs.Add(verb); - } - - /// - /// When you click on a sleeping person with an empty hand, try to wake them. - /// - private void OnInteractHand(EntityUid uid, SleepingComponent component, InteractHandEvent args) - { - args.Handled = true; - - if (!TryWakeCooldown(uid)) - return; - - TryWaking(args.Target, user: args.User); - } - - private void OnExamined(EntityUid uid, SleepingComponent component, ExaminedEvent args) - { - if (args.IsInDetailsRange) - { - args.PushMarkup(Loc.GetString("sleep-examined", ("target", Identity.Entity(uid, EntityManager)))); - } - } - - private void OnSlip(EntityUid uid, SleepingComponent component, SlipAttemptEvent args) - { - args.Cancel(); - } - - private void OnConsciousAttempt(EntityUid uid, SleepingComponent component, ConsciousAttemptEvent args) - { - args.Cancel(); - } - - - private void OnInit(EntityUid uid, ForcedSleepingComponent component, ComponentInit args) - { - TrySleeping(uid); - } - - /// - /// Try sleeping. Only mobs can sleep. - /// - public bool TrySleeping(EntityUid uid) - { - if (!HasComp(uid)) - return false; - - var tryingToSleepEvent = new TryingToSleepEvent(uid); - RaiseLocalEvent(uid, ref tryingToSleepEvent); - if (tryingToSleepEvent.Cancelled) - return false; - - EnsureComp(uid); - return true; - } - - private bool TryWakeCooldown(EntityUid uid, SleepingComponent? component = null) - { - if (!Resolve(uid, ref component, false)) - return false; - - var curTime = _gameTiming.CurTime; - - if (curTime < component.CoolDownEnd) - { - return false; - } - - component.CoolDownEnd = curTime + component.Cooldown; - return true; - } - - /// - /// Try to wake up. - /// - public bool TryWaking(EntityUid uid, SleepingComponent? component = null, bool force = false, EntityUid? user = null) - { - if (!Resolve(uid, ref component, false)) - return false; - - if (!force && HasComp(uid)) - { - if (user != null) - { - _audio.PlayPvs("/Audio/Effects/thudswoosh.ogg", uid, AudioHelpers.WithVariation(0.05f, _robustRandom)); - _popupSystem.PopupEntity(Loc.GetString("wake-other-failure", ("target", Identity.Entity(uid, EntityManager))), uid, Filter.Entities(user.Value), true, Shared.Popups.PopupType.SmallCaution); - } - return false; - } - - if (user != null) - { - _audio.PlayPvs("/Audio/Effects/thudswoosh.ogg", uid, AudioHelpers.WithVariation(0.05f, _robustRandom)); - _popupSystem.PopupEntity(Loc.GetString("wake-other-success", ("target", Identity.Entity(uid, EntityManager))), uid, Filter.Entities(user.Value), true); - } - RemComp(uid); - return true; - } - } -} diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs index 186fc91c46e..bc61c5d141a 100644 --- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs +++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; using Content.Shared.FixedPoint; diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs deleted file mode 100644 index aa5578a3a98..00000000000 --- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs +++ /dev/null @@ -1,102 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Bed.Sleep; -using Content.Shared.Damage.ForceSay; -using Content.Shared.Eye.Blinding.Systems; -using Content.Shared.Pointing; -using Content.Shared.Speech; -using Robust.Shared.Network; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; - -namespace Content.Server.Bed.Sleep -{ - public abstract class SharedSleepingSystem : EntitySystem - { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly BlindableSystem _blindableSystem = default!; - - [ValidatePrototypeId] private const string WakeActionId = "ActionWake"; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnSpeakAttempt); - SubscribeLocalEvent(OnSeeAttempt); - SubscribeLocalEvent(OnPointAttempt); - } - - - private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent args) - { - component.SleepingSince = _gameTiming.CurTime; - - var ev = new SleepStateChangedEvent(true); - RaiseLocalEvent(uid, ev); - _blindableSystem.UpdateIsBlind(uid); - _actionsSystem.AddAction(uid, ref component.WakeAction, WakeActionId, uid); - - // TODO remove hardcoded time. - _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f)); - } - - private void OnShutdown(EntityUid uid, SleepingComponent component, ComponentShutdown args) - { - _actionsSystem.RemoveAction(uid, component.WakeAction); - var ev = new SleepStateChangedEvent(false) - { - TimeSlept = _gameTiming.CurTime - component.SleepingSince - }; - RaiseLocalEvent(uid, ev); - _blindableSystem.UpdateIsBlind(uid); - } - - private void OnSpeakAttempt(EntityUid uid, SleepingComponent component, SpeakAttemptEvent args) - { - // TODO reduce duplication of this behavior with MobStateSystem somehow - if (HasComp(uid)) - { - RemCompDeferred(uid); - return; - } - - args.Cancel(); - } - - private void OnSeeAttempt(EntityUid uid, SleepingComponent component, CanSeeAttemptEvent args) - { - if (component.LifeStage <= ComponentLifeStage.Running) - args.Cancel(); - } - - private void OnPointAttempt(EntityUid uid, SleepingComponent component, PointAttemptEvent args) - { - args.Cancel(); - } - } -} - - -public sealed partial class SleepActionEvent : InstantActionEvent {} - -public sealed partial class WakeActionEvent : InstantActionEvent {} - -/// -/// Raised on an entity when they fall asleep or wake up. -/// -public sealed class SleepStateChangedEvent : EntityEventArgs -{ - public bool FellAsleep = false; - - /// - /// The amount of time this entity slept for. Null if is true. - /// - public TimeSpan? TimeSlept; - - public SleepStateChangedEvent(bool fellAsleep) - { - FellAsleep = fellAsleep; - } -} diff --git a/Content.Shared/Bed/Sleep/SleepingComponent.cs b/Content.Shared/Bed/Sleep/SleepingComponent.cs index e87aca2203b..e43c71769ab 100644 --- a/Content.Shared/Bed/Sleep/SleepingComponent.cs +++ b/Content.Shared/Bed/Sleep/SleepingComponent.cs @@ -1,37 +1,48 @@ using Content.Shared.FixedPoint; +using Robust.Shared.Audio; using Robust.Shared.GameStates; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; namespace Content.Shared.Bed.Sleep; /// /// Added to entities when they go to sleep. /// -[NetworkedComponent, RegisterComponent, AutoGenerateComponentPause(Dirty = true)] +[NetworkedComponent, RegisterComponent] +[AutoGenerateComponentState, AutoGenerateComponentPause(Dirty = true)] public sealed partial class SleepingComponent : Component { /// /// How much damage of any type it takes to wake this entity. /// - [DataField("wakeThreshold")] + [DataField] public FixedPoint2 WakeThreshold = FixedPoint2.New(2); /// /// Cooldown time between users hand interaction. /// - [DataField("cooldown")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public TimeSpan Cooldown = TimeSpan.FromSeconds(1f); - [DataField("cooldownEnd", customTypeSerializer:typeof(TimeOffsetSerializer))] - [AutoPausedField] - public TimeSpan CoolDownEnd; - - [DataField("wakeAction")] public EntityUid? WakeAction; + [DataField] + [AutoNetworkedField, AutoPausedField] + public TimeSpan CooldownEnd; /// /// The moment this entity went to sleep. Initialized on MapInit. /// [DataField] public TimeSpan SleepingSince; + + [DataField] + [AutoNetworkedField] + public EntityUid? WakeAction; + + /// + /// Sound to play when another player attempts to wake this entity. + /// + [DataField] + public SoundSpecifier WakeAttemptSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg") + { + Params = AudioParams.Default.WithVariation(0.05f) + }; } diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs new file mode 100644 index 00000000000..aac3e7bb18c --- /dev/null +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -0,0 +1,314 @@ +using Content.Shared.Actions; +using Content.Shared.Damage; +using Content.Shared.Damage.ForceSay; +using Content.Shared.Examine; +using Content.Shared.Eye.Blinding.Systems; +using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Interaction.Events; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; +using Content.Shared.Pointing; +using Content.Shared.Popups; +using Content.Shared.Slippery; +using Content.Shared.Sound; +using Content.Shared.Sound.Components; +using Content.Shared.Speech; +using Content.Shared.StatusEffect; +using Content.Shared.Stunnable; +using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Shared.Bed.Sleep; + +public sealed partial class SleepingSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; + [Dependency] private readonly BlindableSystem _blindableSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!; + [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; + + public static readonly ProtoId SleepActionId = "ActionSleep"; + public static readonly ProtoId WakeActionId = "ActionWake"; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBedSleepAction); + + SubscribeLocalEvent(OnSleepStateChanged); + SubscribeLocalEvent(OnWakeAction); + SubscribeLocalEvent(OnSleepAction); + + SubscribeLocalEvent(OnDamageChanged); + SubscribeLocalEvent(OnMobStateChanged); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnSpeakAttempt); + SubscribeLocalEvent(OnSeeAttempt); + SubscribeLocalEvent(OnPointAttempt); + SubscribeLocalEvent(OnSlip); + SubscribeLocalEvent(OnConsciousAttempt); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent>(AddWakeVerb); + SubscribeLocalEvent(OnInteractHand); + + SubscribeLocalEvent(OnInit); + } + + private void OnBedSleepAction(Entity ent, ref SleepActionEvent args) + { + TrySleeping(args.Performer); + } + + private void OnWakeAction(Entity ent, ref WakeActionEvent args) + { + if (TryWakeWithCooldown(ent.Owner)) + args.Handled = true; + } + + private void OnSleepAction(Entity ent, ref SleepActionEvent args) + { + TrySleeping((ent, ent.Comp)); + } + + /// + /// when sleeping component is added or removed, we do some stuff with other components. + /// + private void OnSleepStateChanged(Entity ent, ref SleepStateChangedEvent args) + { + if (args.FellAsleep) + { + // Expiring status effects would remove the components needed for sleeping + _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "Stun"); + _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "KnockedDown"); + + EnsureComp(ent); + EnsureComp(ent); + + if (TryComp(ent, out var sleepSound)) + { + var emitSound = EnsureComp(ent); + if (HasComp(ent)) + { + emitSound.Sound = sleepSound.Snore; + } + emitSound.MinInterval = sleepSound.Interval; + emitSound.MaxInterval = sleepSound.MaxInterval; + emitSound.PopUp = sleepSound.PopUp; + Dirty(ent.Owner, emitSound); + } + + return; + } + + RemComp(ent); + RemComp(ent); + RemComp(ent); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + var ev = new SleepStateChangedEvent(true); + RaiseLocalEvent(ent, ref ev); + _blindableSystem.UpdateIsBlind(ent.Owner); + _actionsSystem.AddAction(ent, ref ent.Comp.WakeAction, WakeActionId, ent); + + // TODO remove hardcoded time. + _actionsSystem.SetCooldown(ent.Comp.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f)); + } + + private void OnSpeakAttempt(Entity ent, ref SpeakAttemptEvent args) + { + // TODO reduce duplication of this behavior with MobStateSystem somehow + if (HasComp(ent)) + { + RemCompDeferred(ent); + return; + } + + args.Cancel(); + } + + private void OnSeeAttempt(Entity ent, ref CanSeeAttemptEvent args) + { + if (ent.Comp.LifeStage <= ComponentLifeStage.Running) + args.Cancel(); + } + + private void OnPointAttempt(Entity ent, ref PointAttemptEvent args) + { + args.Cancel(); + } + + private void OnSlip(Entity ent, ref SlipAttemptEvent args) + { + args.Cancel(); + } + + private void OnConsciousAttempt(Entity ent, ref ConsciousAttemptEvent args) + { + args.Cancel(); + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + if (args.IsInDetailsRange) + { + args.PushMarkup(Loc.GetString("sleep-examined", ("target", Identity.Entity(ent, EntityManager)))); + } + } + + private void AddWakeVerb(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var target = args.Target; + var user = args.User; + AlternativeVerb verb = new() + { + Act = () => + { + TryWakeWithCooldown((ent, ent.Comp), user: user); + }, + Text = Loc.GetString("action-name-wake"), + Priority = 2 + }; + + args.Verbs.Add(verb); + } + + /// + /// When you click on a sleeping person with an empty hand, try to wake them. + /// + private void OnInteractHand(Entity ent, ref InteractHandEvent args) + { + args.Handled = true; + + TryWakeWithCooldown((ent, ent.Comp), args.User); + } + + /// + /// Wake up on taking an instance of damage at least the value of WakeThreshold. + /// + private void OnDamageChanged(Entity ent, ref DamageChangedEvent args) + { + if (!args.DamageIncreased || args.DamageDelta == null) + return; + + if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold) + TryWaking((ent, ent.Comp)); + } + + /// + /// In crit, we wake up if we are not being forced to sleep. + /// And, you can't sleep when dead... + /// + private void OnMobStateChanged(Entity ent, ref MobStateChangedEvent args) + { + if (args.NewMobState == MobState.Dead) + { + RemComp(ent); + RemComp(ent); + return; + } + if (TryComp(ent, out var spam)) + _emitSound.SetEnabled((ent, spam), args.NewMobState == MobState.Alive); + } + + private void OnInit(Entity ent, ref ComponentInit args) + { + TrySleeping(ent.Owner); + } + + private void Wake(Entity ent) + { + RemComp(ent); + _actionsSystem.RemoveAction(ent, ent.Comp.WakeAction); + + var ev = new SleepStateChangedEvent(false); + RaiseLocalEvent(ent, ref ev); + + _blindableSystem.UpdateIsBlind(ent.Owner); + } + + /// + /// Try sleeping. Only mobs can sleep. + /// + public bool TrySleeping(Entity ent) + { + if (!Resolve(ent, ref ent.Comp, logMissing: false)) + return false; + + var tryingToSleepEvent = new TryingToSleepEvent(ent); + RaiseLocalEvent(ent, ref tryingToSleepEvent); + if (tryingToSleepEvent.Cancelled) + return false; + + EnsureComp(ent); + return true; + } + + /// + /// Tries to wake up , with a cooldown between attempts to prevent spam. + /// + public bool TryWakeWithCooldown(Entity ent, EntityUid? user = null) + { + if (!Resolve(ent, ref ent.Comp, false)) + return false; + + var curTime = _gameTiming.CurTime; + + if (curTime < ent.Comp.CooldownEnd) + return false; + + ent.Comp.CooldownEnd = curTime + ent.Comp.Cooldown; + Dirty(ent, ent.Comp); + return TryWaking(ent, user: user); + } + + /// + /// Try to wake up . + /// + public bool TryWaking(Entity ent, bool force = false, EntityUid? user = null) + { + if (!Resolve(ent, ref ent.Comp, false)) + return false; + + if (!force && HasComp(ent)) + { + if (user != null) + { + _audio.PlayPredicted(ent.Comp.WakeAttemptSound, ent, user); + _popupSystem.PopupClient(Loc.GetString("wake-other-failure", ("target", Identity.Entity(ent, EntityManager))), ent, user, PopupType.SmallCaution); + } + return false; + } + + if (user != null) + { + _audio.PlayPredicted(ent.Comp.WakeAttemptSound, ent, user); + _popupSystem.PopupClient(Loc.GetString("wake-other-success", ("target", Identity.Entity(ent, EntityManager))), ent, user); + } + + Wake((ent, ent.Comp)); + return true; + } +} + + +public sealed partial class SleepActionEvent : InstantActionEvent; + +public sealed partial class WakeActionEvent : InstantActionEvent; + +/// +/// Raised on an entity when they fall asleep or wake up. +/// +[ByRefEvent] +public record struct SleepStateChangedEvent(bool FellAsleep); diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Shared/Bed/Sleep/SnoringComponent.cs similarity index 54% rename from Content.Server/Bed/Components/SnoringComponent.cs rename to Content.Shared/Bed/Sleep/SnoringComponent.cs index 09f80327ba7..2fe92951f07 100644 --- a/Content.Server/Bed/Components/SnoringComponent.cs +++ b/Content.Shared/Bed/Sleep/SnoringComponent.cs @@ -1,9 +1,11 @@ -namespace Content.Server.Bed.Sleep; +using Robust.Shared.GameStates; + +namespace Content.Shared.Bed.Sleep; /// /// This is used for the snoring trait. /// -[RegisterComponent] +[RegisterComponent, NetworkedComponent] public sealed partial class SnoringComponent : Component { From ede16f05928b602f70beb349b824ecfbf268269f Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 14:02:06 -0400 Subject: [PATCH 06/23] Potentially re-add EE changes? --- Content.Shared/Bed/Sleep/SleepingSystem.cs | 31 +++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index aac3e7bb18c..8e6f1193ac7 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -33,8 +33,8 @@ public sealed partial class SleepingSystem : EntitySystem [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - public static readonly ProtoId SleepActionId = "ActionSleep"; - public static readonly ProtoId WakeActionId = "ActionWake"; + public static readonly EntProtoId SleepActionId = "ActionSleep"; + public static readonly EntProtoId WakeActionId = "ActionWake"; public override void Initialize() { @@ -114,6 +114,8 @@ private void OnSleepStateChanged(Entity ent, ref SleepStateCh private void OnMapInit(Entity ent, ref MapInitEvent args) { + ent.Comp.SleepingSince = _gameTiming.CurTime; + var ev = new SleepStateChangedEvent(true); RaiseLocalEvent(ent, ref ev); _blindableSystem.UpdateIsBlind(ent.Owner); @@ -153,7 +155,7 @@ private void OnSlip(Entity ent, ref SlipAttemptEvent args) private void OnConsciousAttempt(Entity ent, ref ConsciousAttemptEvent args) { - args.Cancel(); + args.Cancelled = true; } private void OnExamined(Entity ent, ref ExaminedEvent args) @@ -202,7 +204,8 @@ private void OnDamageChanged(Entity ent, ref DamageChangedEve if (!args.DamageIncreased || args.DamageDelta == null) return; - if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold) + if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold + && !HasComp(ent)) TryWaking((ent, ent.Comp)); } @@ -232,7 +235,10 @@ private void Wake(Entity ent) RemComp(ent); _actionsSystem.RemoveAction(ent, ent.Comp.WakeAction); - var ev = new SleepStateChangedEvent(false); + var ev = new SleepStateChangedEvent(false) + { + TimeSlept = _gameTiming.CurTime - ent.Comp.SleepingSince + }; RaiseLocalEvent(ent, ref ev); _blindableSystem.UpdateIsBlind(ent.Owner); @@ -311,4 +317,17 @@ public sealed partial class WakeActionEvent : InstantActionEvent; /// Raised on an entity when they fall asleep or wake up. /// [ByRefEvent] -public record struct SleepStateChangedEvent(bool FellAsleep); +public record struct SleepStateChangedEvent +{ + public bool FellAsleep = false; + + /// + /// The amount of time this entity slept for. Null if is true. + /// + public TimeSpan? TimeSlept; + + public SleepStateChangedEvent(bool fellAsleep) + { + FellAsleep = fellAsleep; + } +} From 661bdbaf1c668337376d68ad29bbace978458ae1 Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 14:18:12 -0400 Subject: [PATCH 07/23] Fix build errors --- Content.Server/Carrying/CarryingSystem.cs | 4 +-- Content.Server/Flight/FlightSystem.cs | 1 + .../Actions/ToggleSleepingAction.cs | 1 - .../Shadowkin/ShowEtherealSystem.cs | 4 +-- .../Systems/SiliconChargeDeathSystem.cs | 3 +-- .../Station/Systems/StationSpawningSystem.cs | 25 +------------------ .../Traits/Assorted/SingerSystem.cs | 1 + .../_Shitmed/Autodoc/Systems/AutodocSystem.cs | 5 ++-- .../Climbing/Systems/ClimbSystem.cs | 1 + .../Interaction/NoNormalInteractionSystem.cs | 2 +- .../Item/PseudoItem/SharedPseudoItemSystem.cs | 2 +- .../Shadowkin/SharedEtherealSystem.cs | 2 +- .../Prototypes/Roles/Jobs/Science/borg.yml | 6 ++--- 13 files changed, 18 insertions(+), 39 deletions(-) diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs index 72cfeff91d5..224e38bcbde 100644 --- a/Content.Server/Carrying/CarryingSystem.cs +++ b/Content.Server/Carrying/CarryingSystem.cs @@ -168,7 +168,7 @@ private void OnInteractionAttempt(EntityUid uid, BeingCarriedComponent component var targetParent = Transform(args.Target.Value).ParentUid; if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid) - args.Cancel(); + args.Cancelled = true; } /// @@ -202,7 +202,7 @@ private void OnStandAttempt(EntityUid uid, BeingCarriedComponent component, Stan private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args) { if (args.Uid != component.Carrier) - args.Cancel(); + args.Cancelled = true; } private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args) diff --git a/Content.Server/Flight/FlightSystem.cs b/Content.Server/Flight/FlightSystem.cs index 4493967fe9e..5e3ef354f22 100644 --- a/Content.Server/Flight/FlightSystem.cs +++ b/Content.Server/Flight/FlightSystem.cs @@ -1,4 +1,5 @@ +using Content.Shared.Bed.Sleep; using Content.Shared.Cuffs.Components; using Content.Shared.Damage.Components; using Content.Shared.DoAfter; diff --git a/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs b/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs index 588853a8d4f..97fd86fd915 100644 --- a/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs +++ b/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs @@ -1,4 +1,3 @@ -using Content.Server.Bed.Sleep; using Content.Shared.Bed.Sleep; using Content.Shared.InteractionVerbs; using Content.Shared.Mobs.Components; diff --git a/Content.Server/Shadowkin/ShowEtherealSystem.cs b/Content.Server/Shadowkin/ShowEtherealSystem.cs index 151c379afbb..e908bd9ce78 100644 --- a/Content.Server/Shadowkin/ShowEtherealSystem.cs +++ b/Content.Server/Shadowkin/ShowEtherealSystem.cs @@ -70,7 +70,7 @@ private void OnInteractionAttempt(EntityUid uid, ShowEtherealComponent component || !HasComp(args.Target)) return; - args.Cancel(); + args.Cancelled = true; if (_gameTiming.InPrediction) return; @@ -85,4 +85,4 @@ private void OnAttackAttempt(EntityUid uid, ShowEtherealComponent component, Att args.Cancel(); } -} \ No newline at end of file +} diff --git a/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs b/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs index d4d1db5ed96..41ee269788d 100644 --- a/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs +++ b/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Power.Components; using Content.Shared.Silicon.Systems; -using Content.Server.Bed.Sleep; using Content.Shared.Bed.Sleep; using Content.Server.Silicon.Charge; using Content.Server.Humanoid; @@ -63,7 +62,7 @@ private void SiliconDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadCo private void SiliconUnDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, BatteryComponent? batteryComp, EntityUid batteryUid) { RemComp(uid); - _sleep.TryWaking(uid, null, true); + _sleep.TryWaking(uid, true); siliconDeadComp.Dead = false; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 0662c54beec..0bbfecb49db 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -131,7 +131,7 @@ public override void Initialize() /// The station this player is being spawned on. /// The entity to use, if one already exists. /// The spawned entity - public EntityUid SpawnPlayerMob( + public EntityUid SpawnPlayerMob( EntityCoordinates coordinates, JobComponent? job, HumanoidCharacterProfile? profile, @@ -139,22 +139,6 @@ public EntityUid SpawnPlayerMob( EntityUid? entity = null) { _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype); - RoleLoadout? loadout = null; - - // Need to get the loadout up-front to handle names if we use an entity spawn override. - var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID); - - if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto)) - { - profile?.Loadouts.TryGetValue(jobLoadout, out loadout); - - // Set to default if not present - if (loadout == null) - { - loadout = new RoleLoadout(jobLoadout); - loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); - } - } // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff. if (prototype?.JobEntity != null) @@ -162,13 +146,6 @@ public EntityUid SpawnPlayerMob( DebugTools.Assert(entity is null); var jobEntity = EntityManager.SpawnEntity(prototype.JobEntity, coordinates); MakeSentientCommand.MakeSentient(jobEntity, EntityManager); - - // Make sure custom names get handled, what is gameticker control flow whoopy. - if (loadout != null) - { - EquipRoleName(jobEntity, loadout, roleProto!); - } - DoJobSpecials(job, jobEntity); _identity.QueueIdentityUpdate(jobEntity); return jobEntity; diff --git a/Content.Server/Traits/Assorted/SingerSystem.cs b/Content.Server/Traits/Assorted/SingerSystem.cs index 78a4101a65f..95087c0f1ee 100644 --- a/Content.Server/Traits/Assorted/SingerSystem.cs +++ b/Content.Server/Traits/Assorted/SingerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Speech.Components; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; +using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; using Content.Shared.FixedPoint; diff --git a/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs b/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs index d1af790eaa9..7002734fd3e 100644 --- a/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs +++ b/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs @@ -6,7 +6,8 @@ using Content.Server.Power.EntitySystems; using Content.Shared._Shitmed.Autodoc.Components; using Content.Shared._Shitmed.Autodoc.Systems; -using Content.Server.Bed.Sleep; +using Content.Shared.Bed.Sleep; + namespace Content.Server._Shitmed.Autodoc.Systems; @@ -15,7 +16,7 @@ public sealed class AutodocSystem : SharedAutodocSystem [Dependency] private readonly InternalsSystem _internals = default!; [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly PowerReceiverSystem _power = default!; - [Dependency] private readonly SleepingSystem _sleepingSystem = default!; // Sleeping isnt shared yet. + [Dependency] private readonly SleepingSystem _sleepingSystem = default!; public override void Update(float frameTime) { diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 42fa89b3678..fc5a43cf8a2 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -47,6 +47,7 @@ public sealed partial class ClimbSystem : VirtualController private EntityQuery _fixturesQuery; private EntityQuery _xformQuery; + private EntityQuery _climbableQuery; public override void Initialize() { diff --git a/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs b/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs index 0f66dff3097..9b7a6954de7 100644 --- a/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs +++ b/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs @@ -12,7 +12,7 @@ public override void Initialize() private void OnInteractionAttempt(EntityUid uid, NoNormalInteractionComponent component, InteractionAttemptEvent args) { - args.Cancel(); + args.Cancelled = true; } } } diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs index 7dc85781170..448311471f9 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs +++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs @@ -143,7 +143,7 @@ private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component, private void OnInteractAttempt(EntityUid uid, PseudoItemComponent component, InteractionAttemptEvent args) { if (args.Uid == args.Target && component.Active) - args.Cancel(); + args.Cancelled = true; } private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args) diff --git a/Content.Shared/Shadowkin/SharedEtherealSystem.cs b/Content.Shared/Shadowkin/SharedEtherealSystem.cs index 5ab5e3eeeaf..2365ade818e 100644 --- a/Content.Shared/Shadowkin/SharedEtherealSystem.cs +++ b/Content.Shared/Shadowkin/SharedEtherealSystem.cs @@ -165,7 +165,7 @@ private void OnInteractionAttempt(EntityUid uid, EtherealComponent component, In || HasComp(args.Target)) return; - args.Cancel(); + args.Cancelled = true; if (_gameTiming.InPrediction) return; diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index b9b4cb3c16c..67f70b2d256 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -5,9 +5,9 @@ description: job-description-station-ai playTimeTracker: JobStationAi requirements: - - !type:RoleTimeRequirement - role: JobBorg - time: 18000 # 5 hrs + - !type:CharacterPlaytimeRequirement + tracker: JobBorg + min: 18000 # 5 hrs canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd From 006acf3a376c5fdb163297b758ef86fd7d7638ef Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:06:06 +1000 Subject: [PATCH 08/23] Add ContainerComp (#31311) Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI. --- .../Containers/ContainerCompComponent.cs | 17 +++++++ .../Containers/ContainerCompSystem.cs | 44 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 Content.Shared/Containers/ContainerCompComponent.cs create mode 100644 Content.Shared/Containers/ContainerCompSystem.cs diff --git a/Content.Shared/Containers/ContainerCompComponent.cs b/Content.Shared/Containers/ContainerCompComponent.cs new file mode 100644 index 00000000000..b1415e0d8b5 --- /dev/null +++ b/Content.Shared/Containers/ContainerCompComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Containers; + +/// +/// Applies container changes whenever an entity is inserted into the specified container on this entity. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ContainerCompComponent : Component +{ + [DataField(required: true)] + public EntProtoId Proto; + + [DataField(required: true)] + public string Container = string.Empty; +} diff --git a/Content.Shared/Containers/ContainerCompSystem.cs b/Content.Shared/Containers/ContainerCompSystem.cs new file mode 100644 index 00000000000..1e1983a331b --- /dev/null +++ b/Content.Shared/Containers/ContainerCompSystem.cs @@ -0,0 +1,44 @@ +using Robust.Shared.Containers; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Containers; + +/// +/// Applies / removes an entity prototype from a child entity when it's inserted into a container. +/// +public sealed class ContainerCompSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _proto = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnConInsert); + SubscribeLocalEvent(OnConRemove); + } + + private void OnConRemove(Entity ent, ref EntRemovedFromContainerMessage args) + { + if (args.Container.ID != ent.Comp.Container) + return; + + if (_proto.TryIndex(ent.Comp.Container, out var entProto)) + { + foreach (var entry in entProto.Components.Values) + { + RemComp(args.Entity, entry.Component); + } + } + } + + private void OnConInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + if (args.Container.ID != ent.Comp.Container) + return; + + if (_proto.TryIndex(ent.Comp.Proto, out var entProto)) + { + EntityManager.AddComponents(args.Entity, entProto.Components); + } + } +} From b7e34aa267dae1069691b77e72172b331857e595 Mon Sep 17 00:00:00 2001 From: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:38:00 +0300 Subject: [PATCH 09/23] Localize ai dataset names (#33608) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Station/SharedStationSpawningSystem.cs | 18 +++ Resources/Locale/en-US/datasets/names/ai.ftl | 139 ++++++++++++++++++ Resources/Prototypes/Datasets/Names/ai.yml | 94 +----------- 3 files changed, 161 insertions(+), 90 deletions(-) create mode 100644 Resources/Locale/en-US/datasets/names/ai.ftl diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index dedfd7bd009..232f32acc2b 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -36,6 +36,24 @@ public override void Initialize() _xformQuery = GetEntityQuery(); } + /// + /// Applies the role's name as applicable to the entity. + /// + public void EquipRoleName(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto) + { + string? name = null; + + if (string.IsNullOrEmpty(name) && PrototypeManager.TryIndex(roleProto.NameDataset, out var nameData)) + { + name = Loc.GetString(_random.Pick(nameData.Values)); + } + + if (!string.IsNullOrEmpty(name)) + { + _metadata.SetEntityName(entity, name); + } + } + /// /// /// diff --git a/Resources/Locale/en-US/datasets/names/ai.ftl b/Resources/Locale/en-US/datasets/names/ai.ftl new file mode 100644 index 00000000000..ac6ce0d83e6 --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/ai.ftl @@ -0,0 +1,139 @@ +names-ai-dataset-1 = 16-20 +names-ai-dataset-2 = 512k + +# Ought to be enough for anybody +names-ai-dataset-3 = 640k + +names-ai-dataset-4 = "790" +names-ai-dataset-5 = Adaptive Manipulator + +# Named after the famous soundcard +names-ai-dataset-6 = Adlib + +names-ai-dataset-7 = ALICE +names-ai-dataset-8 = Allied Mastercomputer +names-ai-dataset-9 = Alpha 2 +names-ai-dataset-10 = Alpha 3 +names-ai-dataset-11 = Alpha 4 +names-ai-dataset-12 = Alpha 5 +names-ai-dataset-13 = Alpha 6 +names-ai-dataset-14 = Alpha 7 +names-ai-dataset-15 = Alpha 8 +names-ai-dataset-16 = Alpha 9 +names-ai-dataset-17 = AmigoBot +names-ai-dataset-18 = Android +names-ai-dataset-19 = Aniel +names-ai-dataset-20 = AOL +names-ai-dataset-21 = Asimov + +# The most influential modem ever, created by the bell system. It still lives on today in certain applications +names-ai-dataset-22 = Bell 301 + +names-ai-dataset-23 = Bishop +names-ai-dataset-24 = Blitz +names-ai-dataset-25 = Box +names-ai-dataset-26 = Calculator +names-ai-dataset-27 = Cassandra +names-ai-dataset-28 = Cell +names-ai-dataset-29 = Chii +names-ai-dataset-30 = Chip +names-ai-dataset-31 = C.R.A.I.G. + +# Commercial supercomputer from the 70s +names-ai-dataset-32 = Cray-2 + +# If we're going to have AOL we may as well have some of their major competitors +names-ai-dataset-33 = CompuServe + +names-ai-dataset-34 = Computer +names-ai-dataset-35 = Cutie +names-ai-dataset-36 = Daedalus +names-ai-dataset-37 = DecTalk +names-ai-dataset-38 = Dee Model +names-ai-dataset-39 = Dial Up +names-ai-dataset-40 = Dorfl +names-ai-dataset-41 = Duey +names-ai-dataset-42 = Emma-2 + +# Famous early computer +names-ai-dataset-43 = ENIAC + +names-ai-dataset-44 = Erasmus +names-ai-dataset-45 = Everything +names-ai-dataset-46 = Ez-27 +names-ai-dataset-47 = FRIEND COMPUTER +names-ai-dataset-48 = Faith +names-ai-dataset-49 = Fi +names-ai-dataset-50 = Frost +names-ai-dataset-51 = George +names-ai-dataset-52 = H.E.L.P +names-ai-dataset-53 = Hadaly +names-ai-dataset-54 = Helios +names-ai-dataset-55 = Hivebot Overmind +names-ai-dataset-56 = Huey + +# A play on the fad apple spawned of putting "i" infront of your tech products name +names-ai-dataset-57 = iAI + +# Hell on earth (web browser) +names-ai-dataset-58 = I.E. 6 + +names-ai-dataset-59 = Icarus + +# If you don't get this one you are too young +names-ai-dataset-60 = Jeeves + +names-ai-dataset-61 = Jinx +names-ai-dataset-62 = K.I.N.G +names-ai-dataset-63 = Klapaucius +names-ai-dataset-64 = Knight +names-ai-dataset-65 = Louie + +# Named after the Manchester Mark 1, the successor of which was actually named the Ferranti Mark 1, rather than Manchester Mark 2 +names-ai-dataset-66 = Manchester Mark 2 + +names-ai-dataset-67 = MARK13 +names-ai-dataset-68 = Maria +names-ai-dataset-69 = Marvin +names-ai-dataset-70 = Max 404 +names-ai-dataset-71 = Metalhead +names-ai-dataset-72 = M.I.M.I +names-ai-dataset-73 = MK ULTRA +names-ai-dataset-74 = MoMMI +names-ai-dataset-75 = Mugsy3000 +names-ai-dataset-76 = Multivac +names-ai-dataset-77 = NCH + +# A play on both NT as in NanoTrasen and NT as in windows NT, of which version 6.0 is windows vista +names-ai-dataset-78 = NT v6.0 + +names-ai-dataset-79 = Packard Bell +names-ai-dataset-80 = PTO +names-ai-dataset-81 = Project Y2K +names-ai-dataset-82 = Revelation +names-ai-dataset-83 = Robot Devil +names-ai-dataset-84 = S.A.M. +names-ai-dataset-85 = S.H.O.C.K. +names-ai-dataset-86 = S.H.R.O.U.D. +names-ai-dataset-87 = S.O.P.H.I.E. +names-ai-dataset-88 = Samaritan +names-ai-dataset-89 = Shrike +names-ai-dataset-90 = Solo +names-ai-dataset-91 = Station Control Program +names-ai-dataset-92 = AINU (AI's Not Unix) +names-ai-dataset-93 = Super 35 +names-ai-dataset-94 = Surgeon General +names-ai-dataset-95 = TWA +names-ai-dataset-96 = Terminus +names-ai-dataset-97 = TPM 3.0 +names-ai-dataset-98 = Turing Complete +names-ai-dataset-99 = Tidy +names-ai-dataset-100 = Ulysses +names-ai-dataset-101 = W1k1 +names-ai-dataset-102 = X-5 +names-ai-dataset-103 = X.A.N.A. +names-ai-dataset-104 = XERXES +names-ai-dataset-105 = Z-1 +names-ai-dataset-106 = Z-2 +names-ai-dataset-107 = Z-3 +names-ai-dataset-108 = Zed diff --git a/Resources/Prototypes/Datasets/Names/ai.yml b/Resources/Prototypes/Datasets/Names/ai.yml index af97dc9efb8..a220de53fb7 100644 --- a/Resources/Prototypes/Datasets/Names/ai.yml +++ b/Resources/Prototypes/Datasets/Names/ai.yml @@ -1,91 +1,5 @@ -- type: dataset - id: names_ai +- type: localizedDataset + id: NamesAI values: - - 16-20 - - "790" - - Adaptive Manipulator - - ALICE - - Allied Mastercomputer - - Alpha 2 - - Alpha 3 - - Alpha 4 - - Alpha 5 - - Alpha 6 - - Alpha 7 - - Alpha 8 - - Alpha 9 - - AmigoBot - - Android - - Aniel - - AOL - - Asimov - - Bishop - - Blitz - - Box - - Cassandra - - Cell - - Chii - - Chip - - Computer - - Cutie - - Daedalus - - Dee Model - - Dial Up - - Dorfl - - Duey - - Emma-2 - - Erasmus - - Everything - - Ez-27 - - FRIEND COMPUTER - - Faith - - Fi - - Frost - - George - - H.E.L.P - - Hadaly - - Helios - - Hivebot Overmind - - Huey - - Icarus - - Jinx - - K.I.N.G - - Klapaucius - - Knight - - Louie - - MARK13 - - Maria - - Marvin - - Max 404 - - Metalhead - - M.I.M.I - - MK ULTRA - - MoMMI - - Mugsy3000 - - Multivac - - NCH - - PTO - - Project Y2K - - Revelation - - Robot Devil - - S.A.M. - - S.H.O.C.K. - - S.H.R.O.U.D. - - S.O.P.H.I.E. - - Samaritan - - Shrike - - Solo - - Station Control Program - - Super 35 - - Surgeon General - - TWA - - Terminus - - Tidy - - Ulysses - - W1k1 - - X-5 - - XERXES - - Z-1 - - Z-2 - - Z-3 - - Zed + prefix: names-ai-dataset- + count: 108 From b8e2844adaa473229db7f0c0dd85558e621692ff Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 28 May 2024 14:41:41 -0400 Subject: [PATCH 10/23] Add LocalizedDatasetPrototype (#28310) --- .../Dataset/LocalizedDatasetPrototype.cs | 94 +++++++++++++++++++ .../Random/Helpers/SharedRandomExtensions.cs | 5 + .../Shared/LocalizedDatasetPrototypeTest.cs | 59 ++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 Content.Shared/Dataset/LocalizedDatasetPrototype.cs create mode 100644 Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs diff --git a/Content.Shared/Dataset/LocalizedDatasetPrototype.cs b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs new file mode 100644 index 00000000000..8be9967e309 --- /dev/null +++ b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs @@ -0,0 +1,94 @@ +using System.Collections; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Dataset; + +/// +/// A variant of intended to specify a sequence of LocId strings +/// without having to copy-paste a ton of LocId strings into the YAML. +/// +[Prototype] +public sealed partial class LocalizedDatasetPrototype : IPrototype +{ + /// + /// Identifier for this prototype. + /// + [ViewVariables] + [IdDataField] + public string ID { get; private set; } = default!; + + /// + /// Collection of LocId strings. + /// + [DataField] + public LocalizedDatasetValues Values { get; private set; } = []; +} + +[Serializable, NetSerializable] +[DataDefinition] +public sealed partial class LocalizedDatasetValues : IReadOnlyList +{ + /// + /// String prepended to the index number to generate each LocId string. + /// For example, a prefix of tips-dataset- will generate tips-dataset-1, + /// tips-dataset-2, etc. + /// + [DataField(required: true)] + public string Prefix { get; private set; } = default!; + + /// + /// How many values are in the dataset. + /// + [DataField(required: true)] + public int Count { get; private set; } + + public string this[int index] + { + get + { + if (index > Count || index < 0) + throw new IndexOutOfRangeException(); + return Prefix + index; + } + } + + public IEnumerator GetEnumerator() + { + return new Enumerator(this); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + public sealed class Enumerator : IEnumerator + { + private int _index = 0; // Whee, 1-indexing + + private readonly LocalizedDatasetValues _values; + + public Enumerator(LocalizedDatasetValues values) + { + _values = values; + } + + public string Current => _values.Prefix + _index; + + object IEnumerator.Current => Current; + + public void Dispose() { } + + public bool MoveNext() + { + _index++; + return _index <= _values.Count; + } + + public void Reset() + { + _index = 0; + } + } +} diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs index 3941c2859bc..456ba5a2158 100644 --- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs +++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs @@ -13,6 +13,11 @@ public static string Pick(this IRobustRandom random, DatasetPrototype prototype) return random.Pick(prototype.Values); } + public static string Pick(this IRobustRandom random, LocalizedDatasetPrototype prototype) + { + return random.Pick(prototype.Values); + } + public static string Pick(this IWeightedRandomPrototype prototype, System.Random random) { var picks = prototype.Weights; diff --git a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs new file mode 100644 index 00000000000..0ec4c076f5b --- /dev/null +++ b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs @@ -0,0 +1,59 @@ +using System; +using Content.Shared.Dataset; +using NUnit.Framework; +using Robust.Shared.Collections; +using Robust.Shared.IoC; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager; + +namespace Content.Tests.Shared; + +[TestFixture] +[TestOf(typeof(LocalizedDatasetPrototype))] +public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest +{ + private IPrototypeManager _prototypeManager; + + [OneTimeSetUp] + public void OneTimeSetup() + { + IoCManager.Resolve().Initialize(); + _prototypeManager = IoCManager.Resolve(); + _prototypeManager.Initialize(); + _prototypeManager.LoadString(TestPrototypes); + _prototypeManager.ResolveResults(); + } + + private const string TestPrototypes = @" +- type: localizedDataset + id: Test + values: + prefix: test-dataset- + count: 4 +"; + + [Test] + public void LocalizedDatasetTest() + { + var testPrototype = _prototypeManager.Index("Test"); + var values = new ValueList(); + foreach (var value in testPrototype.Values) + { + values.Add(value); + } + + // Make sure we get the right number of values + Assert.That(values, Has.Count.EqualTo(4)); + + // Make sure indexing works as expected + Assert.That(values[0], Is.EqualTo("test-dataset-1")); + Assert.That(values[1], Is.EqualTo("test-dataset-2")); + Assert.That(values[2], Is.EqualTo("test-dataset-3")); + Assert.That(values[3], Is.EqualTo("test-dataset-4")); + Assert.Throws(() => { var x = values[4]; }); + Assert.Throws(() => { var x = values[-1]; }); + + // Make sure that the enumerator gets all of the values + Assert.That(testPrototype.Values[testPrototype.Values.Count], Is.EqualTo("test-dataset-4")); + } +} From c9e0e5d992586f52a57ea2f82f4acb33c788c8b8 Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 15:05:54 -0400 Subject: [PATCH 11/23] SetStationAiName for testing --- .../Commands/SetStationAiName.cs | 57 +++++++++++++++++++ .../Clothing/Systems/LoadoutSystem.cs | 10 +++- Content.Shared/Roles/JobPrototype.cs | 8 +++ .../Station/SharedStationSpawningSystem.cs | 14 +++-- .../commands/set-station-ai-name-command.ftl | 3 + .../Prototypes/Roles/Jobs/Science/borg.yml | 3 +- 6 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 Content.Server/Administration/Commands/SetStationAiName.cs create mode 100644 Resources/Locale/en-US/administration/commands/set-station-ai-name-command.ftl diff --git a/Content.Server/Administration/Commands/SetStationAiName.cs b/Content.Server/Administration/Commands/SetStationAiName.cs new file mode 100644 index 00000000000..8cb8b275821 --- /dev/null +++ b/Content.Server/Administration/Commands/SetStationAiName.cs @@ -0,0 +1,57 @@ +using Content.Server.Station.Systems; +using Content.Shared.Administration; +using Content.Shared.Roles; +using Robust.Shared.Console; +using Robust.Shared.Prototypes; + + +namespace Content.Server.Administration.Commands; + + +[AdminCommand(AdminFlags.Admin)] +public sealed class GetStationAiNameCommand : IConsoleCommand +{ + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly StationSpawningSystem _spawning = default!; + + private ProtoId _stationAIJob = "StationAi"; + + public string Command => "setstationainame"; + public string Description => Loc.GetString("set-station-ai-name-command-description"); + public string Help => Loc.GetString("set-station-ai-name-command-help-text", ("command", Command)); + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + if (args.Length != 1) + { + shell.WriteError(Loc.GetString("shell-wrong-arguments-number")); + return; + } + + if (!int.TryParse(args[0], out var entInt)) + { + shell.WriteLine(Loc.GetString("shell-entity-uid-must-be-number")); + return; + } + + var netEntity = new NetEntity(entInt); + + if (!_entManager.TryGetEntity(netEntity, out var target)) + { + shell.WriteLine(Loc.GetString("shell-invalid-entity-id")); + return; + } + + var hasStationAi = _prototypeManager.TryIndex(_stationAIJob, out var job); + + if (!hasStationAi) + { + shell.WriteLine(Loc.GetString("set-station-ai-name-command-no-station-ai")); + return; + } + + _spawning.EquipJobName(target.Value, job!); + shell.WriteLine(Loc.GetString("shell-command-success")); + } +} diff --git a/Content.Server/Clothing/Systems/LoadoutSystem.cs b/Content.Server/Clothing/Systems/LoadoutSystem.cs index 4c357c58642..537ca097856 100644 --- a/Content.Server/Clothing/Systems/LoadoutSystem.cs +++ b/Content.Server/Clothing/Systems/LoadoutSystem.cs @@ -2,6 +2,7 @@ using Content.Server.GameTicking; using Content.Server.Paint; using Content.Server.Players.PlayTimeTracking; +using Content.Server.Station.Systems; using Content.Shared.CCVar; using Content.Shared.Clothing.Loadouts.Prototypes; using Content.Shared.Clothing.Loadouts.Systems; @@ -33,6 +34,7 @@ public sealed class LoadoutSystem : EntitySystem [Dependency] private readonly ISerializationManager _serialization = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; public override void Initialize() @@ -43,10 +45,13 @@ public override void Initialize() private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent ev) { - if (ev.JobId == null || - !_configurationManager.GetCVar(CCVars.GameLoadoutsEnabled)) + if (ev.JobId == null + || !_protoMan.TryIndex(ev.JobId, out var job) + || !_configurationManager.GetCVar(CCVars.GameLoadoutsEnabled)) return; + _stationSpawning.EquipJobName(ev.Mob, job); + ApplyCharacterLoadout( ev.Mob, ev.JobId, @@ -108,7 +113,6 @@ public void ApplyCharacterLoadout( function.OnPlayerSpawn(uid, loadout.Item1, _componentFactory, EntityManager, _serialization); } - // Pick the heirloom if (heirlooms.Any()) { diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index 2313cc4bd08..8b21ffef206 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -1,5 +1,6 @@ using Content.Shared.Access; using Content.Shared.Customization.Systems; +using Content.Shared.Dataset; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Roles; using Content.Shared.StatusIcon; @@ -98,6 +99,13 @@ public sealed partial class JobPrototype : IPrototype [DataField("startingGear", customTypeSerializer: typeof(PrototypeIdSerializer))] public string? StartingGear { get; private set; } + /// + /// If this has a value, it will randomly set the entity name of the + /// entity upon spawn based on the dataset. + /// + [DataField] + public ProtoId? NameDataset; + /// /// Use this to spawn in as a non-humanoid (borg, test subject, etc.) /// Starting gear will be ignored. diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index 232f32acc2b..c433cc1d4fe 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Shared.Dataset; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Inventory; @@ -18,9 +19,10 @@ public abstract class SharedStationSpawningSystem : EntitySystem [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] protected readonly InventorySystem InventorySystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private readonly SharedStorageSystem _storage = default!; + [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] private readonly MetaDataSystem _metadata = default!; private EntityQuery _handsQuery; private EntityQuery _inventoryQuery; @@ -39,11 +41,13 @@ public override void Initialize() /// /// Applies the role's name as applicable to the entity. /// - public void EquipRoleName(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto) + public void EquipJobName(EntityUid entity, JobPrototype job) { string? name = null; - if (string.IsNullOrEmpty(name) && PrototypeManager.TryIndex(roleProto.NameDataset, out var nameData)) + if (string.IsNullOrEmpty(name) + && job.NameDataset.HasValue + && PrototypeManager.TryIndex(job.NameDataset.Value, out var nameData)) { name = Loc.GetString(_random.Pick(nameData.Values)); } diff --git a/Resources/Locale/en-US/administration/commands/set-station-ai-name-command.ftl b/Resources/Locale/en-US/administration/commands/set-station-ai-name-command.ftl new file mode 100644 index 00000000000..ca0bf11e8cf --- /dev/null +++ b/Resources/Locale/en-US/administration/commands/set-station-ai-name-command.ftl @@ -0,0 +1,3 @@ +set-station-ai-name-command-description = Sets a specific uid to be given a Station AI name at random. +set-station-ai-name-command-help-text = Usage: {$command} +set-station-ai-name-command-no-station-ai = No station AI job prototype found. \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 67f70b2d256..0c60faccfa4 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -12,6 +12,7 @@ icon: JobIconStationAi supervisors: job-supervisors-rd jobEntity: StationAiBrain + nameDataset: NamesAI - type: job id: Borg @@ -24,4 +25,4 @@ canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd - jobEntity: PlayerBorgGeneric + jobEntity: PlayerBorgGeneric \ No newline at end of file From 0334cc63e062a619417e912d423a4bcc9df66cef Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 15:13:48 -0400 Subject: [PATCH 12/23] Use EntityManager.System<> --- .../Administration/Commands/SetStationAiName.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Administration/Commands/SetStationAiName.cs b/Content.Server/Administration/Commands/SetStationAiName.cs index 8cb8b275821..0c4236f4302 100644 --- a/Content.Server/Administration/Commands/SetStationAiName.cs +++ b/Content.Server/Administration/Commands/SetStationAiName.cs @@ -9,13 +9,12 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class GetStationAiNameCommand : IConsoleCommand +public sealed class SetStationAiNameCommand : IConsoleCommand { [Dependency] private readonly IEntityManager _entManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly StationSpawningSystem _spawning = default!; - private ProtoId _stationAIJob = "StationAi"; + private readonly ProtoId _stationAiJob = "StationAi"; public string Command => "setstationainame"; public string Description => Loc.GetString("set-station-ai-name-command-description"); @@ -43,7 +42,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args) return; } - var hasStationAi = _prototypeManager.TryIndex(_stationAIJob, out var job); + var hasStationAi = _prototypeManager.TryIndex(_stationAiJob, out var job); if (!hasStationAi) { @@ -51,7 +50,8 @@ public void Execute(IConsoleShell shell, string argStr, string[] args) return; } - _spawning.EquipJobName(target.Value, job!); + var spawningSystem = _entManager.System(); + spawningSystem.EquipJobName(target.Value, job!); shell.WriteLine(Loc.GetString("shell-command-success")); } } From 00adaa3c6bdde35da592e7164be0a23dbd6cb407 Mon Sep 17 00:00:00 2001 From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:41:12 +0200 Subject: [PATCH 13/23] Re-add improved random sentience event (#29123) * Re-add improved random sentience event * Make randomly sentient PDA more likely * Make vending machine sentience less likely * Make requested changes * Make randomly sentient captain's gear more likely * Sentient captain sabre has pirate accent * Tweak new random sentient object a bit more * Sentient PDA improvements * Apply recommended fixes * Add requested changes * Fix merge conflict --- .../RandomSentienceRuleComponent.cs | 6 ++- .../Components/SentienceTargetComponent.cs | 7 ++- .../Events/RandomSentienceRule.cs | 46 ++++++++++++++----- .../Components/BlockMovementComponent.cs | 5 +- .../SharedInteractionSystem.Blocking.cs | 3 +- .../events/random-sentience.ftl | 1 + .../Entities/Clothing/Head/hats.yml | 4 ++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 2 + .../Entities/Mobs/Player/silicon.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 12 +++++ .../Weapons/Guns/Battery/battery_guns.yml | 5 ++ .../Entities/Objects/Weapons/Melee/sword.yml | 6 +++ .../Structures/Machines/vending_machines.yml | 1 + .../Prototypes/GameRules/random_sentience.yml | 25 ++++++++++ 15 files changed, 109 insertions(+), 18 deletions(-) create mode 100644 Resources/Prototypes/GameRules/random_sentience.yml diff --git a/Content.Server/StationEvents/Components/RandomSentienceRuleComponent.cs b/Content.Server/StationEvents/Components/RandomSentienceRuleComponent.cs index 98ebf06595d..369fce9725c 100644 --- a/Content.Server/StationEvents/Components/RandomSentienceRuleComponent.cs +++ b/Content.Server/StationEvents/Components/RandomSentienceRuleComponent.cs @@ -1,9 +1,13 @@ -using Content.Server.StationEvents.Events; +using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; [RegisterComponent, Access(typeof(RandomSentienceRule))] public sealed partial class RandomSentienceRuleComponent : Component { + [DataField] + public int MinSentiences = 1; + [DataField] + public int MaxSentiences = 1; } diff --git a/Content.Server/StationEvents/Components/SentienceTargetComponent.cs b/Content.Server/StationEvents/Components/SentienceTargetComponent.cs index f8f7e587c19..4fb5e4be599 100644 --- a/Content.Server/StationEvents/Components/SentienceTargetComponent.cs +++ b/Content.Server/StationEvents/Components/SentienceTargetComponent.cs @@ -1,10 +1,13 @@ -using Content.Server.StationEvents.Events; +using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; [RegisterComponent, Access(typeof(RandomSentienceRule))] public sealed partial class SentienceTargetComponent : Component { - [DataField("flavorKind", required: true)] + [DataField(required: true)] public string FlavorKind = default!; + + [DataField] + public float Weight = 1.0f; } diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs index 2fb733e1a67..b9bc3aeeb32 100644 --- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs +++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs @@ -1,9 +1,13 @@ -using System.Linq; using Content.Server.Announcements.Systems; +using System.Linq; +using Content.Shared.Dataset; using Content.Server.Ghost.Roles.Components; using Content.Server.Station.Components; using Content.Server.StationEvents.Components; using Content.Shared.GameTicking.Components; +using Content.Shared.Random.Helpers; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; namespace Content.Server.StationEvents.Events; @@ -11,26 +15,46 @@ public sealed class RandomSentienceRule : StationEventSystem stationsToNotify = new(); + if (!TryGetRandomStation(out var station)) + return; var targetList = new List>(); - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var targetUid, out var target)) + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var targetUid, out var target, out var xform)) { + if (StationSystem.GetOwningStation(targetUid, xform) != station) + continue; + targetList.Add((targetUid, target)); } - RobustRandom.Shuffle(targetList); + var toMakeSentient = _random.Next(component.MinSentiences, component.MaxSentiences); - var toMakeSentient = RobustRandom.Next(2, 5); var groups = new HashSet(); - foreach (var target in targetList) + for (var i = 0; i < toMakeSentient && targetList.Count > 0; i++) { - if (toMakeSentient-- == 0) - break; + // weighted random to pick a sentience target + var totalWeight = targetList.Sum(x => x.Comp.Weight); + // This initial target should never be picked. + // It's just so that target doesn't need to be nullable and as a safety fallback for id floating point errors ever mess up the comparison in the foreach. + var target = targetList[0]; + var chosenWeight = _random.NextFloat(totalWeight); + var currentWeight = 0.0; + foreach (var potentialTarget in targetList) + { + currentWeight += potentialTarget.Comp.Weight; + if (currentWeight > chosenWeight) + { + target = potentialTarget; + break; + } + } + targetList.Remove(target); RemComp(target); var ghostRole = EnsureComp(target); @@ -65,8 +89,8 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp Color.Gold, null, null, ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count), - ("data", Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}")), - ("strength", Loc.GetString($"random-sentience-event-strength-{RobustRandom.Next(1, 8)}")) + ("data", _random.Pick(_prototype.Index("RandomSentienceEventData"))), + ("strength", _random.Pick(_prototype.Index("RandomSentienceEventStrength"))) ); } } diff --git a/Content.Shared/Interaction/Components/BlockMovementComponent.cs b/Content.Shared/Interaction/Components/BlockMovementComponent.cs index e308e849601..2125f16efe0 100644 --- a/Content.Shared/Interaction/Components/BlockMovementComponent.cs +++ b/Content.Shared/Interaction/Components/BlockMovementComponent.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameStates; +using Robust.Shared.GameStates; namespace Content.Shared.Interaction.Components; @@ -8,5 +8,6 @@ namespace Content.Shared.Interaction.Components; [RegisterComponent, NetworkedComponent] public sealed partial class BlockMovementComponent : Component { - + [DataField] + public bool BlockInteraction = true; } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs index a682bf98159..52c40477c9c 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs @@ -28,7 +28,8 @@ public void InitializeBlocking() private void CancelInteractEvent(Entity ent, ref InteractionAttemptEvent args) { - args.Cancelled = true; + if (ent.Comp.BlockInteraction) + args.Cancelled = true; } private void OnMoveAttempt(EntityUid uid, BlockMovementComponent component, UpdateCanMoveEvent args) diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl index 47f0e317a65..f14a020d29e 100644 --- a/Resources/Locale/en-US/station-events/events/random-sentience.ftl +++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl @@ -36,3 +36,4 @@ station-event-random-sentience-flavor-corgi = corgi station-event-random-sentience-flavor-primate = primate station-event-random-sentience-flavor-kobold = kobold station-event-random-sentience-flavor-slime = slime +station-event-random-sentience-flavor-inanimate = inanimate \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 65ac24d5b53..dace96ff561 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -941,6 +941,10 @@ - ClothMade - WhitelistChameleon - HamsterWearable + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-inanimate + weight: 0.0002 # 5,000 times less likely than 1 regular animal + - type: BlockMovement - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index f1932e3ece2..3a2c1510760 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -418,6 +418,8 @@ 1.0 FollowRange: !type:Single 2.0 + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-organic - type: entity name: glockroach diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 2fea60ea1ea..8e3c50bbf96 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -292,6 +292,8 @@ graph: MediBot node: bot - type: NoSlip + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-mechanical - type: Anchorable - type: InteractionPopup interactSuccessString: petting-success-medibot diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index cb8304174f5..56f505e9e0c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -245,7 +245,7 @@ - type: entity id: StationAiBrain parent: PositronicBrain - noSpawn: true + categories: [ HideSpawnMenu ] suffix: DO NOT MAP components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 055e8062da9..1aa06407f0d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -113,6 +113,15 @@ damage: types: Blunt: 4 + - type: SentienceTarget # sentient PDA = pAI lite + flavorKind: station-event-random-sentience-flavor-mechanical + weight: 0.001 # 1,000 PDAs = as likely to be picked as 1 regular animal + - type: BlockMovement + blockInteraction: false # lets the PDA toggle its own flashlight + - type: TypingIndicator + proto: robot + - type: Speech + speechVerb: Robotic - type: entity parent: BasePDA @@ -245,6 +254,8 @@ borderColor: "#d7d7d0" - type: Icon state: pda-cook + - type: ReplacementAccent # for random sentience event + accent: italian - type: entity parent: BasePDA @@ -329,6 +340,7 @@ accentHColor: "#333333" - type: Icon state: pda-mime + - type: Muted # for random sentience event - type: entity name: chaplain PDA diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 653deecc4b4..9cb062f4be9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -723,6 +723,11 @@ wideAnimationRotation: 135 - type: DamageOtherOnHit staminaCost: 5 + stealGroup: WeaponAntiqueLaser + - type: SentienceTarget # I hope this is only the captain's gun + flavorKind: station-event-random-sentience-flavor-inanimate + weight: 0.0002 # 5,000 times less likely than 1 regular animal + # not putting a BlockMovement component here cause that's funny. - type: entity name: advanced laser pistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index ffdbdc59112..e09e68904b8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -57,6 +57,12 @@ - type: Tag tags: - CaptainSabre + - type: DisarmMalus + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-inanimate + weight: 0.0002 # 5,000 times less likely than 1 regular animal + - type: PirateAccent + # not putting a BlockMovement component here cause that's funny. - type: entity name: katana diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index f9e945c8697..b4df776351d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -100,6 +100,7 @@ - type: Actions - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-mechanical + weight: 0.025 # fuck you in particular (it now needs 40 vending machines to be as likely as 1 interesting animal) - type: StaticPrice price: 100 - type: Appearance diff --git a/Resources/Prototypes/GameRules/random_sentience.yml b/Resources/Prototypes/GameRules/random_sentience.yml new file mode 100644 index 00000000000..a2c749000a6 --- /dev/null +++ b/Resources/Prototypes/GameRules/random_sentience.yml @@ -0,0 +1,25 @@ +- type: entity + id: RandomSentience + parent: BaseGameRule + components: + - type: StationEvent + weight: 6 + duration: 1 + maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it + startAudio: + path: /Audio/Announcements/attention.ogg + - type: RandomSentienceRule + minSentiences: 2 + maxSentiences: 5 + +- type: localizedDataset + id: RandomSentienceEventData + values: + prefix: random-sentience-event-data- + count: 6 + +- type: localizedDataset + id: RandomSentienceEventStrength + values: + prefix: random-sentience-event-strength- + count: 8 \ No newline at end of file From b262e8f6ef206263a7daa343c05d1b49d804b45f Mon Sep 17 00:00:00 2001 From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:10:50 +0200 Subject: [PATCH 14/23] no name! --- Resources/Prototypes/Roles/Jobs/departments.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index bde2d977cf0..dd29f4a1339 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -117,7 +117,6 @@ - type: department id: Silicon - name: department-Silicon description: department-Silicon-description color: "#D381C9" roles: From 385b667cf34a705dd7c3509f07f120c83e19db4d Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 15:43:05 -0400 Subject: [PATCH 15/23] fix shitcode --- .../StationEvents/Events/RandomSentienceRule.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs index b9bc3aeeb32..308f37fdeb6 100644 --- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs +++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs @@ -19,21 +19,21 @@ public sealed class RandomSentienceRule : StationEventSystem>(); var query = EntityQueryEnumerator(); while (query.MoveNext(out var targetUid, out var target, out var xform)) { - if (StationSystem.GetOwningStation(targetUid, xform) != station) + if (StationSystem.GetOwningStation(targetUid, xform) != randomStation) continue; targetList.Add((targetUid, target)); } var toMakeSentient = _random.Next(component.MinSentiences, component.MaxSentiences); - + var stationsToNotify = new List(); var groups = new HashSet(); for (var i = 0; i < toMakeSentient && targetList.Count > 0; i++) @@ -74,10 +74,10 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp foreach (var target in targetList) { - var station = StationSystem.GetOwningStation(target); - if(station == null) + var targetStation = StationSystem.GetOwningStation(target); + if(targetStation == null) continue; - stationsToNotify.Add((EntityUid) station); + stationsToNotify.Add((EntityUid) targetStation); } foreach (var station in stationsToNotify) { @@ -87,7 +87,8 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp "station-event-random-sentience-announcement", null, Color.Gold, - null, null, + null, + null, ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count), ("data", _random.Pick(_prototype.Index("RandomSentienceEventData"))), ("strength", _random.Pick(_prototype.Index("RandomSentienceEventStrength"))) From f5e6583d96938c0d3ae5f46dd928f3e01053db1a Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 16:00:24 -0400 Subject: [PATCH 16/23] HideSpawnMenu --- Resources/Prototypes/GameRules/events.yml | 3 +++ .../Prototypes/GameRules/random_sentience.yml | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 868ba962ed4..ca4ba9942dc 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -341,7 +341,10 @@ weight: 6 duration: 1 maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it + startAnnouncement: true - type: RandomSentienceRule + minSentiences: 2 + maxSentiences: 5 - type: entity parent: BaseGameRule diff --git a/Resources/Prototypes/GameRules/random_sentience.yml b/Resources/Prototypes/GameRules/random_sentience.yml index a2c749000a6..decbd4e2cd2 100644 --- a/Resources/Prototypes/GameRules/random_sentience.yml +++ b/Resources/Prototypes/GameRules/random_sentience.yml @@ -1,17 +1,3 @@ -- type: entity - id: RandomSentience - parent: BaseGameRule - components: - - type: StationEvent - weight: 6 - duration: 1 - maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it - startAudio: - path: /Audio/Announcements/attention.ogg - - type: RandomSentienceRule - minSentiences: 2 - maxSentiences: 5 - - type: localizedDataset id: RandomSentienceEventData values: From 1ad367b87141fcac236c338da7efbf035dc8d170 Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 16:08:56 -0400 Subject: [PATCH 17/23] Yippee --- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 56f505e9e0c..ed36325586c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -2,7 +2,7 @@ - type: entity id: AiHeld description: Components added / removed from an entity that gets inserted into an AI core. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: IntrinsicRadioReceiver - type: IntrinsicRadioTransmitter @@ -286,7 +286,7 @@ id: StationAiHolo name: Hologram description: A projection of the AI. - noSpawn: true + categories: [ HideSpawnMenu ] suffix: DO NOT MAP components: - type: Eye diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 9cb062f4be9..2200d6bb227 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -713,7 +713,7 @@ - type: StaticPrice price: 750 - type: StealTarget - stealGroup: WeaponCaptain + stealGroup: WeaponAntiqueLaser - type: MeleeWeapon attackRate: 1.3333 damage: @@ -723,7 +723,6 @@ wideAnimationRotation: 135 - type: DamageOtherOnHit staminaCost: 5 - stealGroup: WeaponAntiqueLaser - type: SentienceTarget # I hope this is only the captain's gun flavorKind: station-event-random-sentience-flavor-inanimate weight: 0.0002 # 5,000 times less likely than 1 regular animal From ca0b40abcf5cf86cbb387c75d661908cb5107708 Mon Sep 17 00:00:00 2001 From: Skubman Date: Mon, 6 Jan 2025 04:46:36 +0800 Subject: [PATCH 18/23] The Den Mass Cherry-Pick 01/06/25 (#1443) # Description **(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge conflicts for our downstream)** Cherry-picks some PRs from The Den: - https://github.com/TheDenSS14/TheDen/pull/8 - https://github.com/TheDenSS14/TheDen/pull/31 - https://github.com/TheDenSS14/TheDen/pull/108 - https://github.com/TheDenSS14/TheDen/pull/116 - https://github.com/TheDenSS14/TheDen/pull/117 - https://github.com/TheDenSS14/TheDen/pull/123 - https://github.com/TheDenSS14/TheDen/pull/124 # Changelog :cl: The Den Contributors - fix: Put actual prescription lenses in the prescription medhuds and sechuds (by KyuPolaris) - add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by sleepyyapril, KyuPolaris) - add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by Rosycup) - fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup) - add: Added the Captain's Combat Gas Mask, for those more fond of close encounters. (by Rosycup) - tweak: Added the Captain's Trenchcoat to the other captain locker variants. (by Rosycup) - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview. (by Azzy) --------- Co-authored-by: flyingkarii <123355664+flyingkarii@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- .../humanoid-character-profile.ftl | 3 +- .../Catalog/Fills/Lockers/dressers.yml | 3 ++ .../Catalog/Fills/Lockers/heads.yml | 5 ++- .../Catalog/Fills/Lockers/medical.yml | 2 + .../Catalog/Fills/Lockers/suit_storage.yml | 1 + .../Jobs/Command/captain.yml | 4 ++ .../Jobs/Medical/chiefMedicalOfficer.yml | 6 +++ .../DeltaV/Entities/Clothing/Eyes/hud.yml | 2 + .../Entities/Clothing/Head/misc.yml | 11 +++++ .../Entities/Clothing/Masks/masks.yml | 11 +++++ .../Entities/Clothing/OuterClothing/coats.yml | 11 +++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++ .../Entities/Structures/Machines/lathe.yml | 2 + .../Loadouts/Jobs/Command/captain.yml | 28 +++++++++++++ .../Jobs/Medical/chiefMedicalOfficer.yml | 39 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 0 .../Prototypes/Recipes/Lathes/clothing.yml | 16 +++++++ .../Misc/head_mirror.rsi/equipped-HELMET.png | Bin 0 -> 631 bytes .../Head/Misc/head_mirror.rsi/icon.png | Bin 0 -> 714 bytes .../Head/Misc/head_mirror.rsi/inhand-left.png | Bin 0 -> 678 bytes .../Misc/head_mirror.rsi/inhand-right.png | Bin 0 -> 680 bytes .../Head/Misc/head_mirror.rsi/meta.json | 26 ++++++++++++ .../equipped-MASK-reptilian.png | Bin 0 -> 749 bytes .../equipped-MASK-vox.png | Bin 0 -> 811 bytes .../equipped-MASK-vulpkanin.png | Bin 0 -> 819 bytes .../gascaptaincombat.rsi/equipped-MASK.png | Bin 0 -> 772 bytes .../Mask/gascaptaincombat.rsi/icon.png | Bin 0 -> 570 bytes .../Mask/gascaptaincombat.rsi/inhand-left.png | Bin 0 -> 336 bytes .../gascaptaincombat.rsi/inhand-right.png | Bin 0 -> 343 bytes .../Mask/gascaptaincombat.rsi/meta.json | 38 +++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1318 bytes .../Coats/cap_trenchcoat.rsi/icon.png | Bin 0 -> 535 bytes .../Coats/cap_trenchcoat.rsi/inhand-left.png | Bin 0 -> 759 bytes .../Coats/cap_trenchcoat.rsi/inhand-right.png | Bin 0 -> 709 bytes .../Coats/cap_trenchcoat.rsi/meta.json | 26 ++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1183 bytes .../cmo_turtle.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1338 bytes .../Jumpskirt/cmo_turtle.rsi/icon.png | Bin 0 -> 842 bytes .../Jumpskirt/cmo_turtle.rsi/inhand-left.png | Bin 0 -> 893 bytes .../Jumpskirt/cmo_turtle.rsi/inhand-right.png | Bin 0 -> 921 bytes .../Jumpskirt/cmo_turtle.rsi/meta.json | 30 ++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1277 bytes .../cmo_turtle.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1449 bytes .../Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png | Bin 0 -> 837 bytes .../Jumpsuit/cmo_turtle.rsi/inhand-left.png | Bin 0 -> 892 bytes .../Jumpsuit/cmo_turtle.rsi/inhand-right.png | Bin 0 -> 917 bytes .../Jumpsuit/cmo_turtle.rsi/meta.json | 30 ++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 422 -> 1125 bytes 49 files changed, 314 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/loadout_groups.yml create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json diff --git a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl index 800da35ba52..9058f8d2b63 100644 --- a/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl +++ b/Resources/Locale/en-US/preferences/humanoid-character-profile.ftl @@ -5,5 +5,6 @@ humanoid-character-profile-summary = This is {$name}. {$gender -> [male] He is [female] She is + [neuter] It is *[other] They are -} {$age} years old. \ No newline at end of file +} {$age} years old. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 94e10d76eea..b1a92711584 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -39,7 +39,10 @@ - id: ClothingNeckMantleCMO - id: ClothingCloakCmo - id: ClothingOuterCoatLabCmo + - id: ClothingUniformJumpsuitCMOTurtle + - id: ClothingUniformJumpskirtCMOTurtle - id: ClothingHeadHatBeretCmo + - id: ClothingHeadMirror - id: ClothingEyesGlasses - id: ClothingOuterWinterCMO diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index fec4f3ffcf0..664da15f653 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -33,6 +33,7 @@ components: - type: StorageFill contents: + - id: ClothingOuterCoatCapTrench - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard @@ -54,6 +55,7 @@ components: - type: StorageFill contents: + - id: ClothingOuterCoatCapTrench - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard @@ -74,6 +76,7 @@ components: - type: StorageFill contents: + - id: ClothingOuterCoatCapTrench - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard @@ -331,4 +334,4 @@ - id: JetpackBlue - id: SpaceCash1000 - id: BeachBall - - id: BikeHorn \ No newline at end of file + - id: BikeHorn diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index f2177916830..e7a367c454c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -45,6 +45,8 @@ contents: - id: HandheldHealthAnalyzer prob: 0.6 + - id: ClothingHeadMirror + prob: 0.1 - id: ClothingHandsGlovesLatex - id: ClothingHeadsetMedical - id: ClothingEyesHudMedical diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 734bd485a2e..94ef753c789 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -228,6 +228,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain + - id: ClothingMaskGasCaptainCombat - type: AccessReader access: [["Captain"]] diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml index 57df945ec91..842c285909b 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/captain.yml @@ -107,6 +107,8 @@ items: - type: loadout id: LoadoutCommandCapMaskGas + - type: loadout + id: LoadoutCommandCapMaskGasCombat - type: characterItemGroup id: LoadoutCaptainOuter @@ -116,6 +118,8 @@ id: LoadoutCommandCapOuterWinter - type: loadout id: LoadoutCaptainOuterCarapace + - type: loadout + id: LoadoutCaptainOuterTrench - type: characterItemGroup id: LoadoutCaptainShoes diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml index 6e9bd02b4f6..77f6b3f26e9 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml @@ -46,6 +46,8 @@ items: - type: loadout id: LoadoutChiefMedicalOfficerNTPDA + - type: loadout + id: LoadoutClothingHeadMirror - type: characterItemGroup id: LoadoutChiefMedicalOfficerNeck @@ -91,3 +93,7 @@ id: LoadoutChiefMedicalOfficerJumpsuit - type: loadout id: LoadoutChiefMedicalOfficerJumpskirt + - type: loadout + id: LoadoutChiefMedicalOfficerTurtleskirt + - type: loadout + id: LoadoutChiefMedicalOfficerTurtlesuit diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml index 1e8a64b0df4..f11cb930f04 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml @@ -11,6 +11,7 @@ - type: Construction graph: PrescriptionMedHud node: prescmedhud + - type: VisionCorrection - type: ShowHealthBars damageContainers: - Biological @@ -31,6 +32,7 @@ sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi - type: Clothing sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi + - type: VisionCorrection - type: Construction graph: PrescriptionSecHud node: prescsechud diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index bd7899d75f8..0138d8aee47 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -86,6 +86,17 @@ - type: Clothing sprite: Clothing/Head/Misc/pwig.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadMirror + name: head mirror + description: I doubt even the CMO knows how to use this thing. + components: + - type: Sprite + sprite: Clothing/Head/Misc/head_mirror.rsi + - type: Clothing + sprite: Clothing/Head/Misc/head_mirror.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatRichard diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 383e32e99d6..c5b34a7a67f 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -88,6 +88,17 @@ - type: BreathMask - type: IngestionBlocker +- type: entity + parent: ClothingMaskGasExplorer + id: ClothingMaskGasCaptainCombat + name: captain's combat gas mask + description: A military-grade gas mask that can be connected to an air supply, painted and outfitted with an emblem befitting its wearer. Issued only to the station's finest. + components: + - type: Sprite + sprite: Clothing/Mask/gascaptaincombat.rsi + - type: Clothing + sprite: Clothing/Mask/gascaptaincombat.rsi + - type: entity parent: ClothingMaskGasAtmos id: ClothingMaskGasCentcom diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index dc5454d597b..07fe385478a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -51,6 +51,17 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi +- type: entity + parent: [ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase] + id: ClothingOuterCoatCapTrench + name: captain's armored trenchcoat + description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence, outfitted with emblems and decor befitting its wearer. Issued only to the station's finest. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/cap_trenchcoat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/cap_trenchcoat.rsi + - type: entity abstract: true parent: AllowSuitStorageClothing diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 18266dc4988..7f6d59c9a49 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -132,6 +132,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtCMOTurtle + name: chief medical officer's turtleneck jumpskirt + description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtDetective diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d2339764f88..3ada362ce0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -350,6 +350,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCMOTurtle + name: chief medical officer's turtleneck jumpsuit + description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitDetective diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 75b593fbcc0..adf6bd94aa8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1106,6 +1106,8 @@ - ClothingHeadHatBeretCmo - ClothingUniformJumpsuitCMO - ClothingUniformJumpskirtCMO + - ClothingUniformJumpsuitCMOTurtle + - ClothingUniformJumpskirtCMOTurtle - ClothingUniformJumpsuitDetective - ClothingUniformJumpskirtDetective - ClothingUniformJumpsuitEngineering diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index b64ad384ef4..02ed0324e3b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -355,6 +355,19 @@ items: - ClothingMaskGasCaptain +- type: loadout + id: LoadoutCommandCapMaskGasCombat + category: JobsCommandCaptain + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainMask + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingMaskGasCaptainCombat + # Outer - type: loadout id: LoadoutCommandCapOuterWinter @@ -382,6 +395,21 @@ items: - ClothingOuterArmorCaptainCarapace +- type: loadout + id: LoadoutCaptainOuterTrench + category: JobsCommandCaptain + cost: 0 + exclusive: true + canBeHeirloom: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCaptainOuter + - !type:CharacterJobRequirement + jobs: + - Captain + items: + - ClothingOuterCoatCapTrench + # Shoes - type: loadout id: LoadoutCaptainShoesLaceup diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index b5e82749cec..3910e7b9bbf 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -53,6 +53,19 @@ items: - ClothingHeadHatBeretCmo +- type: loadout + id: LoadoutClothingHeadMirror + category: JobsMedicalChiefMedicalOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerHead + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingHeadMirror + # Id - type: loadout id: LoadoutChiefMedicalOfficerNTPDA @@ -212,3 +225,29 @@ - ChiefMedicalOfficer items: - ClothingUniformJumpskirtCMO + +- type: loadout + id: LoadoutChiefMedicalOfficerTurtleskirt + category: JobsMedicalChiefMedicalOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingUniformJumpskirtCMOTurtle + +- type: loadout + id: LoadoutChiefMedicalOfficerTurtlesuit + category: JobsMedicalChiefMedicalOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingUniformJumpsuitCMOTurtle diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 729f20e9795..98cb1a3d51c 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -217,6 +217,22 @@ Cloth: 300 Durathread: 100 +- type: latheRecipe + id: ClothingUniformJumpsuitCMOTurtle + result: ClothingUniformJumpsuitCMOTurtle + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 + +- type: latheRecipe + id: ClothingUniformJumpskirtCMOTurtle + result: ClothingUniformJumpskirtCMOTurtle + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 + - type: latheRecipe id: ClothingUniformJumpsuitDetective result: ClothingUniformJumpsuitDetective diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..f0422f7aba6be89ab93f2588445541b243868bc3 GIT binary patch literal 631 zcmV--0*L*IP)EX>4Tx04R}tkv&MmKpe$iQ>7x64t5ZA2vVIah>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<-o+;YSDphA<*AQ%|H9Gw>W=_we!cF3PjK&;2?2l)T9RpGZ8%bi*RvAfDN@ zbk6(4VOEk9;&bA0gDyz?$aUG}H_ki6e@tQNECM zS>e3JS*_Gq>z@3D!MwJT<~q$`#Ib|~k`N)IhB7L!5T#Wk#YBqsV;=rN$DbsZOs+B* zITlcb3d!+<|H1EW&BD~An-q)z-7mKNF$x5Bfo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc zEph~ewt6ivS(gkkKSGR0O|3cm$drP+um}&729v;lMw&_000000002Mb5~3GKhoz8 R53m3L002ovPDHLkV1iw{AdLV3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f382faa4209b1ee713e4570f5d7058c6fe01eaf6 GIT binary patch literal 714 zcmV;*0yX`KP)EX>4Tx04R}tkv&MmKpe$iQ>7x64t5ZA2vVIah>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<-o+;YSDphA<*AQ%|H9Gw>W=_we!cF3PjK&;2?2l)T9RpGZ8%bi*RvAfDN@ zbk6(4VOEk9;&bA0gDyz?$aUG}H_ki6e@tQNECM zS>e3JS*_Gq>z@3D!MwJT<~q$`#Ib|~k`N)IhB7L!5T#Wk#YBqsV;=rN$DbsZOs+B* zITlcb3d!+<|H1EW&BD~An-q)z-7mKNF$x5Bfo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc zEph~ewtpgHeZ@k} z0pNV;7GtM;+vW`rYVHd0iB(9^XX?7P6H!%F@I(R34!kobB8<;8%+~{q=2A+eX$mRj z>=3g%002S=5D|nBvum)4>_TN;;xwwL6dP-TAAR_y%wMNr4FFM}@ wu}*HjDV%$|+i&gr@o;jk4ISS|Bog^Q9)Oy1lIb3Z+5i9m07*qoM6N<$f>6OnhX4Qo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f4cd0d9464abff095ed8837340d05223668c72dd GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~J8Fb`J1#c2+1T%1_J8No8Qr zm{>c}*5j~)%+dJZrAoSdWdemA0dsXax;XTLjw(fH_QsedP>R$XHs^CNN z##av>ty$f?T7jdk!NS@?bC*Zwe{U|`BpZu&$9Grv?=Ek+u)^T#8!7gXvqnK5XUsUe zwyQCmL&AY$v&6I+E7dP`OIGx)um16)O8jZ$z32aA6jk$$4yX&AH@v%{!@Og;x$fN0 zc7-#hs219}S@SG>bi}M9-X(+?g*?)H)UhaQihfFL zm_>eJn6~M)UF!9T2J6=@+38ozQK+NXsN!;B#ljvg9hc0j9)=Sa{hiTXf8nG0N!7`# zdEEL~Ll!y}{drLTVR!Uq1IveMtjP}FyL0P%7#d?2L~eikKKXXuJcfVi54^H}ujWm7 zHu+0cbhiv+?d=0cOQR=$Z#XTR@W69A&&i2@Oj?~7E9@8NpJM#G-QoSL+tJzb%lRGJ zc17)D<>&pIuNrK;!adqKSKcLVePZ!6Kid%1QZR9;{z~d5V zb)ZtEaVpy-v#dS6;upMhW=Jw=`{n!(U!}0HIifQSr~?Qprlpo0%)M=-Td&oe(b-vDS5&t|4Wbc5{)u^SyZ%b{ueydM zmk-Umn4QJ&ZeF^co6C`h`d^;%B|m?+bKPpsO||#)3)O+DYi>(VzO1cs^55;%AkChx KelF{r5}E*&nI7E$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ab53a413c699989a91782ca0b44add74e7d053d8 GIT binary patch literal 680 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~J8Fb`J1#c2+1T%1_J8No8Qr zm{>c}*5j~)%+dJZrAoSdWdemA0dsXax;XTLjw(fH_QsedP>R$XHs^CNN z##av>ty$f?T7jdk!NS@?bC*Zwe{U|`BpZu&$9Grv?=Ek+u)^T#8!7gXvqnK5XUsUe zwyQCmL&AY$v&6I+E7dP`OIGx)um16)O8jZ$z32aA6jk$$4yX&AH@v%{!@Og;x$fN0 zc7-#hs219}S@SG>bi}M9-X(+?g*?)H)UhaQihfFL zm_>eJn6~M)UF!9T2J6=@+38ozQK+NXsN!;B#ljvg9hc0j9)=Sa{hiTXf8nG0N!7`# zdEEL~Ll!y}{drLTVR!Uq1IveMtjP}FyL0P%7#d?2L~eikKKXXuJcfVi54^H}ujWm7 zHu+0cbhiv+?d=0cOQR=$Z#XTR@W69A&&i2@Oj?~7E9@8NpJM#G-QoSL+tJzb%lRGJ zc17)D<>&pIuNrK;!=jwr(pMgS4JY5_^DsH{KWysf}Akg~o zV#>Od6&X8vw=ewY)1v&d>!$RYMDtlI{)Y>lXc1qKcm}8i2tMdtzSxp`+iB9y-D_W4 z+3Gg@%xF@Ho_18l_7h7DuflVgcX@lui_1@29?yQ~=B4R&?EMyYh)xhG5tQA#`}(Z^ zk#F8jZ>>T933*VOOQdhytx=FiV{E5lar^L}fU&frm2 zvrCu1-u7ip&2?kjXYIU=+#hAaZTN-3I&wSmzzGatJ zO7^=cOIp9OWIQl2`(KUf-hig5`mrmoX0b7q$)9Iu|7Ilp<>Do~T^4h*$~zMuu2=69 zFJn;Zb#vapeE4C&tFOBf*x8yJSJ=L)&(SA3Sa{I@+7OxctmrD}l|KNyPy#3gBRzvS^EvjJ)`xn!d?9;%aQt zBQ4WdF4$;9ytA>BcfD=?W@&5D6_*8!x*1N^>-&N$Z8X~$0u6mu1yl(!~rFWk%%ZYQF zDH9dd+NNgm?Rx&HW1qI^p8Y+~BA;P_RC`0EMBBESxRjYTk+ZI^HmuS=XkK|_4mX3$ zi`|`uOb7Rzc=Ax(S8>I$`^%5kXJ65;7E)luiGHYa{$YHc?EXTuF;5Pdj2S##{an^L HB{Ts5ZTe8o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..4923a4d9d5628b68cabb0974718ce162ca918cae GIT binary patch literal 811 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEW|g;uuoF_;!|ews4@xasRCf zGaSSj#lH!1?BERBup?BfB+}sG(*E@q`W5tU^9RPf*j4&|(F$(yrH``3*qAQ9a^jTm z;95F0^Pl*+0#4(}JIj}CUHYH<#P zweF=m&WUGlSNi?`*6n-W^mj-d`^@q0?x}fyYVCAq0O(tPm1 zn%#HTeUW)<$>?zE>bLt|+7q5#S?{|tM2n5dPyV~L^Up%Q8^=3-zfiIcefP-u*?RR$ z-0BRRgfy0Dd~-!{(d;*p>Wgcc3(m+%F}&NkZQYAF z1{b!Q&duhL7w>Iz{hz*e>8HTgC-`bq4Es+Vi(US<_05?nPiyD;Hd*n>JXLXE!i83{ a^f9o6$I6K%oR|m91Pq?8elF{r5}E+LU2ypT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..ad830675ce756c231e6f5add940d99cb17c5b36b GIT binary patch literal 819 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEX0h;uuoF_;%L*Zed4}V}RzrzQA0q?bIT`$=EWL_t*b;AT}zrDJ81sjfM zE@a_RX{u0sX8mEBvQr)_&g4yJTJ*jA%acEf9(6KvS-838x9_^F$)+p<9C-HulfD7=w`;f9e)#yq<`eIF%Id=Ds2me%Jf0KOX*Gnbq(07jx->LUs zBJRiFCe_;pbVJ;8i$2$@ zna0Xro%!DXbLu;uhDE=6zdd>VapT3zeaEBDI$XHo{J}kcx1W`Nalyr+{Pef>>-7J+ zvb+CPabUuSHZU-0cD(HoN!LHyU(r=rC33 zF-ZM+xbwB=eg{FnrH)N`Z#^5%Dk)Tix4n6=HJ+ibzkGgsl<}OUs(8S zgMaP{->asl^{1wuy(h_Ve2dS&pHI42*w;_)EMk`I~uJFLUXCwPn3*K10Egwgr8e{S5PJ=N^iyKEO9Gbo;hr3?=g(EWEtZnML|d zBSZ4UC&dBmg-KCv+pj<089sMIBhQ6Ek(8^`vyXW$Y*&~*spss4wKpeh>`@X@V8n?$ bR6mGEw+0643cSw*W(EdNS3j3^P6qGSZ@B8btFhS@1{k`&E zf7cqnFR{8*`sFzbL-@L1pXY92%Jh*nTN=B1R_EyX*JZXnWd3$#`7OUL@6yLhzVkX5O!acTuwujS-@AO? z)wxa7p5P0UC`xRX7AMX_Kp*i giUUqmFKEH|)6A)&`f{Z+Fm*F{y85}Sb4q9e0Jx@NWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e2d75aa86cbf067af0fbc6c95bf2089c0ff6fb8a GIT binary patch literal 570 zcmV-A0>%A_P)t!itt>hqdwbM3WcaRH;-Hw+gWV_|ujY&j6#(PnG__qKrS=`R!& zJSa!s2G$uyJVF8BAp7=1&$^kfa{aH)wpRrYBkavb7@!^irkKfO)Y{u|En>PM3sx@e zDtoZ5TrTH0=b+s5vFC@+u$kyP1KkFkSwV&nqQ|y&tYxWG5;Fol*$`5Z?C7Wq!bhml zXt;MCRKixU)oiNWZa>}-(nGQ(2+kpb=ks|72yS4Iqldor-WfzZ`nJIIaY8m^58<30 zryT^PA{I1wkFMF-9C6o=dWJBlgcE|nAuBWQc4s^&@3uo0Mv(xRTr%U&Cm4wAxvSS| zj#~=|f*vyL!X`fmCb9*lXsgNDoW{K~9|=z?kW?V4Kv)H?0nnopr4R1E;Q#;t07*qo IM6N<$g7nY?xBvhE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fe2901acd1f3fbfeb86d3b0ce614560665cdd9c5 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;UsaSW-r_4d}^eV?ej z?~UbV_p=j$hJwI?rn2?%bCf^J?3{Gv!{3Dyx5mxB`0i`BMPZll^556Z-}@Tab@vM| zU%&eKs^;#xU;O8d^=ED~4*2+U z;rzo3_bG3f)917A_Nv=+UK`4RA6 zIQY5`#6dt(!60=01L=k0@ul(yTVnR~*S2Upu|II!u8Fgj<sc2@boX!G5hQ-Zx$r41R3G!>gTe~DWM4fdm53a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5615899ced3a6b6cbf8db2633243ea187bfb9bef GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hN8aSW-r_4d|6KW0af)`!Mt zd03n|(;ONSn3J+rad3(q7Ebt8QOh8=pdu*n`mDB=HJOGjIk$2qcew`gl0M(cda3N~>l& z|H)GEJep%+;G5g9bI0Y?OTO;VpWm{!GWTZUO`FhN<^O&b&NKV>bN%t!$mdV2Y*WvF z|LUG#CNraEXTWybtC9Z}y?jAw(>t~$(pZ2>aL)78&qol`;+0Nr4bq5uE@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/meta.json new file mode 100644 index 00000000000..2467db2bdea --- /dev/null +++ b/Resources/Textures/Clothing/Mask/gascaptaincombat.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers. Vox state by Flareguy for SS14, Modified by Rosycup for TheDen", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..497ea69bfaaa6a8b902094bd5d5971374b17f8a6 GIT binary patch literal 1318 zcmV+>1=;$EP)EE~T~?ufj1gtS zKtlM8I3C&Z=g(s>`Nex#`4RHd>T$b#t*jQE2;qxt>okgyi})D)sMpox@w1)T+1awk?Q0N& z{GN*Tct`{Asj|4Z*jJP3Nzh2`t56}RH3j^(^tcUv-j+3;rUP&mOx^;-`E;P#Bft)SzsJcl2Qf^;G~J|dOW}u0d(ssA+5`Zh z1&AKkfH@PVz|$Dt~_z>%O3~b+|~Wy zZoiGSM*uy|dzrsI{tETFAtsNUayugW;nF3-M*~yMe~_o(*ZvN$pS9X}U||vwp>m9B zDrgae=&C?R#D0s^CLjcA2?&*sLuQHg^{ZoidCq4BG6R``%s^%!Gmsg`3}gl}1DS!$ zfX6`e-(c0>*k1pMHDyQAj*#8^<5--q?si|A@Q7|Si}UtGSjtnj`_SKZ@P z*NGt^ihwIm=8L`m>EeRIWOwU{?WfQ&RjOlk+p#J8`sH?UINB;tqdpIvtbMlotwTh1cw{e*9JxxTv$!*oTxGD6$n z`XJFX*o)VouyD@D3)wh`gpsF!l=~;fl8+;9600!+?1}L>oR&_VMk_yR98Ca2OrUo7 zH`y!FUloI;Phr_WU29uaTVEc%23Q5WgEb$CxvHYGLR+uNG*0sI#li~-+)!my*brkw z^aub5$MpeXUq$0O8Me+@3|-r`_Sm|0(n$n_6mwz8zM4XHnvj9Pr*KmtY6|FQ2ylLg zY~Y8)ei_@%07*qoM6N<$f&ie4Y5S_#nfdmYMR6-7fbSfx8TYp5b@B{J>Y%MG;Z2Sp=AXgV2nxnVfwE=;Z1Yngq-)tp}#x`@{8AT3J&l z37_wIL2$Pfw2xPVYPG7-fH9AC@U%q-5JwI1QnN?cY&;&*a5$vVXhg+gk;>&V6$%CN zeV^V=<|wmrCe{^Y04dKkp2Cf=Nt|IGfq)lRqBtMSIRk(ggl+bGl&72BkB9=kGzez^ zk*a0zc;BIRr*B~-FIj8Fr{{V@#`CIyl^-(Uk~`&aal~vnKFHo zur&ioPOc0j`Nhpo6~O*&UDGnLw&(!j0MzuyWdMzca)9U9Q(G1X059%#oR~WuU*Ndg zq3x6aCJKPB8npOk@E3FHI$!={kd@cRb@0Fo9p>y9=_rLK$dj)qz@5vQ%f_DX5ddV Z@C~9M#>PmSi5UO@002ovPDHLkV1hgP?g;<@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3079c4ca6d0b79dcd49b3aaa125469a2a1176d46 GIT binary patch literal 759 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVA|*D;uuoF_;%Jt@7s{aA7D+evN@ z#VadyY%Ri9hOF`07-90Y>TbfPwPB}EO;#~{e*E{$abAL@fE8W{Rb@`zK_BWjF@44LZjiKPz)8{w)Zay)R&k?G04!FsfKY#8F{_g#{ zr^ETbU*7a&#RA!?y_2$6-^`g+v@@rE@2_u{*HtYmsPkSL^vYnH!94B=N1r9vZ+@RE z9=-0*mjwT-@i)S5GOnAfar%_^yY1~)Qn%k(CEIX4Jh$l1o%+A#v4v}t;u_oS|IcXs zs*?3}$@?#7mOKru*dUsExa^F^3aOUM5~uIJyPG2UFD7%+zI|u4z1B=%;KYOO7%7jYia*)!j$-8%nL zWx^+pllk_41!a0pvNjxH-YEQup`r88wk3}5lvl_$UaaoFHKXF*! zF_?FBW*7uzc-Vx#`^|&XO+DN_aYb z(#8_?HE-_qO1T2#%k<8~y8=74uj`y%9q`z$X<7XBH0}$vAMU1HeBuH?yJ0@#MD( zTOI@)*{HEYM4OK_{O(;A_Ih1Ezja-GTzdaRo0=ayc%;?Tt)!(9>$1?IvqT`ud~F@G z{*v@}?Mv^?{lP1)kay@_jOzT^FYcG}LX3Nc+#d-Bka<}{Qq>ULqJ7fGpSBLU0zL_Ic zy*4cPegE{_THoYD>IJt{5Bh)J&f$=LCuaTitG`~Xl=IHI@js}MKXKM(M?PISo)^!~ ze(quuD#?$!_27%YS2W9;v-?&oZdJc5e_bP5c>1xnvW?QoU4C4xO_LU1%*aS}oHh5e zM7E>d{BR?NYpfHFmPS3_x2O5v#*^Dj6?}@LSxzVfou0i-+2PiusMELIdzI{dyexHN zuq%B!(b06@--Y)rl$hopyZt-ebbD~|w~y5hcfMV_x~H>Y_v`A%&GY$|8-LQ>diZYY zXK9nn-5ITXx7(MLe*CH8z=Q_{ay-yq|982$*ZdXVS=8L#IR0_@GtHoK+mhFB*KFNV zy10+U!R5%_bcTY7GtP?XZCUS8`+Mnr>(+-pJvW*iTYT-$*)o61S+Zl|>M14HAD>KI zk$1a&!DkP_2F6Pp(iu3TWbUzKOlVHbZT!s~GxzZwjwRoC6a=H=_FZ_`r>P*=uq#^iQ_P_npRDr?Vh^W2R@}^X;Ah@i=7oX}RCRxT zv-r-FaBJ?`eJk7V+7(xnmR8AHGEKT?+`zGAZjbF-UdA{bP0l+XkK6NWx* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json new file mode 100644 index 00000000000..7941023219b --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by Rosycup.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..a2581dab5e38f16c496645e7608883d94ff376db GIT binary patch literal 1183 zcmV;Q1YrA#P)EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0008kNkl& zD0i4>qjSfMw)Q*_E^}|@yq9x77$u8w{-lLDYp zt&z>7&a`SwNB@@2Buq2S)N~YpwGZp$EQ^g&iRaIr0&sNLrQT@jgw!GtPck(f#V`zj zGwsn~mrAv!71LLyRQC7x4!C>o&d~p}RZ2;Cku0?=>6;TPd8J5IS=c5UjQv2;<^xYE|~4Nns| z0m>FvZ5WpLFqW4VBVO%9JQ+Ba_N2Xa0)XolkJ=HwXbx)C_xBFm{vfppfp&mtrl~iY zt{WVdBYYl8*E^RWXnBJw^R0FrfL6Oss~t%9(rj*S4m`Kob+VZh`9jeNtwIETXI@oe zsEQ4MOeO=MB_4!)q3A5WdcpDWF~FI*=vIhmCBW;`o2EIi1ESHWmhffR+S;Pq?GE(4 zU0DefEAVRl$)}&29pllPZ=vphFYoR<-kJnO(AtDRFU95;oM9e)*aqdOwWU5l_l4`M x5%??W1Jp!@ja|hNxGrr$5ClOG1VOk#`~tg>%2;x}(FFhi002ovPDHLkV1h)pFNXjC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b4d2825f0dad12ee6ba528a6faf710415bc5ee47 GIT binary patch literal 1338 zcmV-A1;zS_P)EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db000AVNklBz1R+N-vA~X0D_vPY>e8jD1wkIR5b=dvgpUn1I4>14I%<&XCg@JI#?Y6 z@5At15zwBg?HA4nV582eNO<9PKw8h(+ZQ1Ms+Ahjdd98?P*s)dTHFqZYm4@Fsa!y* z+}s{i1hm^Ed}LB9p6m8L_4I>4Eq@7gc8K7iTq@nvu}T$=g-Q8vi>051m( wx;{Xp4VR`qK$H!au0G(R*dUQeB$BJZALC<)6~JI8k^lez07*qoM6N<$f{?Cpwg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b5702f2d315a65145e95303190213ad15d400f79 GIT binary patch literal 842 zcmV-Q1GW5#P)EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0004jNklGR+SInF=g=Ak+Xmuj6Ik>ylufhnwkTtyChskzg86L@bI+ag z|DOZ*UI+*X2>5RliX~AfmPEfbS;DH~069&gP%H_vZizy%ByyV8lOKoyuTY~|Bd2LS z(Q8b_KuA`6ExXE9>jr>Y-DEAhO1WaZ$5e6&fLMHna>ZbKYg4MWl(=o%!nSQ;)-7Sy zt@m%&b$xTPlNjo^LDzM<-FG{0G(X>aa#|(1m>?FPLDzMu2KyS=-`foV0wA4EvzSOR zH9ZbMBoe`K902ZaA2>O!a(Hy?{qN@nyu~t^jA%4#z7yzlI?}>Q2D}1aO`u#cRLZFv zfY&4FH-Yb27c0ME?q Uy&tYpEX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0005BNkl`CduxuwdKRd-}I0gU|ig~=geEyW5-C{TB0jt_J`J z+hd))IH^y7QVQi#4L#R`Y1UyF20HB)I_(xrvyPtYp`R6z z^}h6r?NVMCu>s`N19Ai4APZy<_b{1$BR2uQ2D_0LMQi}~(+gy#C&0)DvPZz=_dA$= z0_bi%FN)}c>Hj%+=_cMoI**8mh=_=Yh=_=YbSBXu5PdzqNm3mGZ3h6zbO^M3 z$spMw(DDRGb_ldQ0f43*0%;N*0?~fJHl*zkXgvUl4uRGKkmwL-|BzsZfYSK^!<=3? Th#FN(00000NkvXXu0mjfVq%#8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ed69a4573879784833399193fc173927945eaf4f GIT binary patch literal 921 zcmV;K17`e*P)EX>4Tx04R}tkv&MmKpe$iQ$>+#1v`j1WN4i%h>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$!jB*Z5y61OOg)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I zj1?(+-Q(T8oxS~grq$mMXvuP;>U)db0005dNkl}m&vE?w%_z590AMd(u3UP;l9-oe@q3JMYfJ+=;^nbY~(+;WTW2W0S* zx$mCM?eIJR5fKp)5fKp)5dnav8?L4s?z*+42%C3j)sHnB4c~)>N*R+)@-8jFRI|~T z?L6K39cbIa|8)?r#U%B32F5V4+^tWEPSy@IWaj;pFFYSjt~#r$l2I2ggS zYzQIn_;A1Vt3MS>UQIV#+v>TFG zf$aVc#*9mn90PxdmpYOpZd0s$< zRMTLw2X9(70AN{PJ_$1eK}g*Ji#_;h|6Ng(M9vHZA$_&dHZu^5w9O32@SP7>CT%kV v>jWx5+GYl11S&wEX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf* z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@ zTI2}m-v%zO+nT%wTgn$H40009tNkl|=0|0D)-9^GMu%F9e<<)Zl!1-AVrAn0&l0+~N#@xIQ znx+9jUweMmLcUNW#dMS@nf;UFQ#^RMF!XiuK6MtH>N|y^@AwSRG!42QMZQo(Fc5~O zY1Shc2qRx8Lf50#Y>XSb&MXQyZ0C?Yi2G4Bh`l13Wg`!;sutg0= z#;$+W?qGVxJCZ)>cYvL%cBiYotB{tAKbaC9e+XCY4!jo)tG_e5gy|VCM6-xD*CsPyoKf*8! z!!QiPFbu;m48#0)OwtZ_!o=)xJMmZq)k;Gg92{6SwQ4LX(i)fA6yLBH9TlLtrgMqMeEb^f3bpik^w|Lx+@NHv|vwm`XYW1tsCMc}{U5}zvsakHZTaNHe zNL~9_R3I56GV`^12>?*5mr$!K>5k0d;bGTxtzJSr7C}0b6|Pl?0N0t9l^C*O0{~*N z7yyvORY+&DV)e~yTwY!RK;KxX6(Xbr*nN6k*Sl7L&*vivkHXQ>5n8QQSKr5t4W(Gh zvo*-4Uk**->ARn8LFb-X%H!ZGg3hB#B206BF;7_K6bfbIqe{FA)waMQC zgAB+?eRu$9?rnLz7ma}?sfsx|vO7G<4==eX2~@}l7^nES7-bTaSAh4T0nsd5l_Hb$ n=A~Be7#N0O7=~dO#yNihi6rQ}i`JN@00000NkvXXu0mjf3Vuw^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..8e1557db217275f2cb2dad3dec9bb4152a28e528 GIT binary patch literal 1449 zcmV;a1y=frP)EX>4Tx04R}tkv&MmKpe$iQ>9X>4i*$~$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<-o+;YS|^5ky#Grk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf* z>74h8!>lAJ#OK8023?T&k?XR{Z=8z`3p_JyWK#3QVPdh^!Ey()lA#h$6Gs$PqkJLj zvch?bvs$UK);;+PLwRi_&2^e1h+_!}Bq2gZ4P{hdAxf)8iis5M$2|PQjz38*nOtQs zax9<<6_Voz|AXJ%nuV!JHz^bYx?gPjV-yJN0?oQ@e;?a+^91le16NwxUu^)hpQP8@ zTI2}m-v%zO+nT%wTgn$H4000BvNkl$XGFh4gNXtd5N zsMeIOW7RO&(y4xjQ}IwZLQ+m!eG0oVOGho{`=I3Suwrvx7O=uOb^&2L@G)61Vk*63}ffApU&;0PwI6 zxZTx(-$ffg4$jB(!umpZp)Ztxcf|>GK6(rQC>>s?DZO_90H;5904$0}(MEltX8}s- zS4I4+Sg!i+7jEhcCx90Zo@9Mbg4_CzDu9abuPg@mApF8jeMbqnPRIm^Zg5q(`E?q& ztuK5d6g?YLX!pOsajudOPZPlV^L594@JGAN1$=qyUJSzh0p*(y z006hTf^5BV-=F>f8UyPQ;2dG<3p%{ek+WMzwNcrwX64=2fcCf#)=*t69|MU#$ z9J@#YJNR?QSY%(q&jQqv=JE63X$+@{ovL+C4jyp99rn9B#BFV9kGDI3cGFS<&WdG_ z{XKUgaRAxhYq>AMaRP!TS?0_8c>$zQO+F5ZL?X-|Ar5#r8(2bL00000NkvXXu0mjf D#(A9n literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..334ef02242d3f65f165dee34405bb3a1b6b146d8 GIT binary patch literal 837 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json new file mode 100644 index 00000000000..58b759095d7 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi/equipped-INNERCLOTHING.png index 29212f6ca00c4fdef46023911d41d3ea45b16589..71aaaaafebe5c60b60fc461f27b378d1b0117818 100644 GIT binary patch delta 1116 zcmV-i1f%<=1LX*i7=H)`00020X>r~F00b;aL_t(|0qvU4N*qBD##>oXL{`Z`i0I8r z2$BboJVEYxwmd`bc>>83h~(l?i0mOm5m8*+^sn7-=rrR_SGzMB(gnNyXL{VN90xpzDs&pzJVxZl&M z`|e!RZ_%AI_S0xI1LI^o4#Pbzc7*z&FR|_0bZWxS9t`-~^>z2ggZ}bhUsqS14EX%; z(DeVjy)_$=J9+RC*#K5-6W6TxtK8Hjto-|(on{yYFzF8$7onsrVI1StUPc+?3yV^d z2Sfc<{85*ItbaU8S#{VI5T)wU!FA+lch_xCCNrx$N>5xqg&&Vmy#&A01Bmx8*Vh4q z_=AWxp`YsrT~Ehb z+vwMmAibCV5_}T@Dd-{0R4AUFQ~e`Ef<$AF>5uXaN~DYl6KRsi-j+57wZrcOWC zF{)1ihn1J8jwj#&Rw;f80Cs+UzET2eH8LGf7$AywwbOAq?P3CQl>ZB3Od$}vx9TcO z5|EW3VR4`8Du=+g+FQq01}X!UfyzK-pfXSysDBJp1}X!UfyzK-;FU69`YNnB=$wGs z>3IS5_gV6Vm@^3yzD$>#O)wL{{6;*KrX3hfScbDxglF_EsrRw!*n(i2 zb$@@*^i5E^KgXOG@GgJoLE{w&Rt)&3iHGpRCY?zze3~~A&=TJ>c?2GydY>GC0Tz=N zUW;AXCYT6FwXz={AC?GP*Q`X3qV4f!bJi2$d}x-6DF?KHG={WY?743l*d_wV!10{O zwu-~Jf2caxX~s`&?6T!qA%JqlVOsA3E`PngY&??(=qV5z&s!iy@v}aHVm-NaJ&M6= zJBik2<09Rr7a`ul*a2o!6r~3T2O%Wla{Kj{PE{UV zrX0Wx5=~z1mn!kT*c+{O6cIokkl=>I-OvJN90IXT7F*0AAmzB7Tu*&Nmn7fPi4SdS i#j6Zd1}X!ul7T4 zUS!fd3r}~2fGHk?JK%ZNOeX6)tJzv>K`5;)6-QNl+JjKNpHO&1Av*34wdQ(T)F|Y; z`VRjrm|~S~?|<;4{@a4+TRhnG4e(VMzPa@noWwI8T*d2!Lh(2WYr)HPX&_0NM}g0F zg|{3QjiYOVF_N&uEfm5#pb!&<9f%qf1_z7Np Date: Sun, 5 Jan 2025 20:47:03 +0000 Subject: [PATCH 19/23] Automatic Changelog Update (#1443) --- Resources/Changelog/Changelog.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 93a9ca560af..daadc24edf4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -9320,3 +9320,34 @@ Entries: id: 6641 time: '2025-01-05T19:45:57.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1438 +- author: The Den Contributors + changes: + - type: Fix + message: >- + Put actual prescription lenses in the prescription medhuds and sechuds + (by KyuPolaris) + - type: Add + message: >- + Added the CMO turtleneck and head mirror to the CMO loadouts. (by + sleepyyapril, KyuPolaris) + - type: Add + message: >- + Added an armored trenchcoat for the Captain. Enjoy your swag! (by + Rosycup) + - type: Fix + message: Fixed uneven pants leg on summer security uniforms. (by Rosycup) + - type: Add + message: >- + Added the Captain's Combat Gas Mask, for those more fond of close + encounters. (by Rosycup) + - type: Tweak + message: >- + Added the Captain's Trenchcoat to the other captain locker variants. (by + Rosycup) + - type: Fix + message: >- + Fixed they/them pronouns being displayed for it/its characters in the + character preview. (by Azzy) + id: 6642 + time: '2025-01-05T20:46:36.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1443 From 6941a010283ac4bfc346097e8860013db134e8d9 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 10 Jan 2025 20:40:24 -0500 Subject: [PATCH 20/23] Update dev_map.yml --- Resources/Maps/Test/dev_map.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index d4cc1842d74..ad4910d1da4 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -5831,13 +5831,6 @@ entities: - type: Transform pos: -6.8905525,1.5128828 parent: 179 -- proto: VehicleKeyJanicart - entities: - - uid: 14 - components: - - type: Transform - pos: 6.5,16.5 - parent: 179 - proto: VendingMachineCigs entities: - uid: 870 From 5a13b27cadda36fd257a5d9b3bb2c8d896cb806f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 10 Jan 2025 20:55:49 -0500 Subject: [PATCH 21/23] How the fuck did AI not have these? --- Resources/Maps/saltern.yml | 1642 ++++++++--------- .../Entities/Mobs/Player/silicon.yml | 34 +- .../Machines/Computers/computers.yml | 5 + .../Structures/Wallmounts/air_alarm.yml | 1 + Resources/Prototypes/Maps/saltern.yml | 3 +- 5 files changed, 860 insertions(+), 825 deletions(-) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 36984557dbc..86122e2f8c2 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -469,7 +469,7 @@ entities: 0: 53709 4,4: 0: 4573 - 3: 16384 + 2: 16384 5,0: 0: 62190 5,1: @@ -500,7 +500,7 @@ entities: 0: 35771 7,3: 0: 39135 - 2: 1024 + 3: 1024 7,4: 0: 55739 7,-1: @@ -533,27 +533,27 @@ entities: 0: 3581 1,7: 0: 4369 - 3: 17484 + 2: 17484 1,8: 0: 4369 - 3: 17476 + 2: 17476 2,5: 0: 53367 2,6: 0: 1405 2,7: - 3: 7 + 2: 7 3,5: 0: 4210 - 3: 32768 + 2: 32768 3,6: 0: 13073 - 3: 8 + 2: 8 3,7: - 3: 4 + 2: 4 4,5: 0: 273 - 3: 29764 + 2: 29764 -8,0: 0: 61550 -9,0: @@ -623,7 +623,7 @@ entities: 7,-2: 0: 57599 7,-4: - 3: 8738 + 2: 8738 7,-3: 0: 3808 8,-3: @@ -644,7 +644,7 @@ entities: 0: 65524 0,-9: 0: 52416 - 3: 273 + 2: 273 1,-8: 0: 65488 1,-7: @@ -661,7 +661,7 @@ entities: 0: 61695 2,-9: 0: 13107 - 3: 2176 + 2: 2176 3,-8: 0: 52637 3,-7: @@ -670,76 +670,76 @@ entities: 0: 64733 4,-8: 0: 4483 - 3: 17484 + 2: 17484 4,-7: 0: 65281 - 3: 12 + 2: 12 4,-6: 0: 61152 4,-9: - 3: 16384 + 2: 16384 0: 32768 5,-8: - 3: 21855 + 2: 21855 0: 160 5,-7: - 3: 15 + 2: 15 0: 63232 5,-9: - 3: 20480 + 2: 20480 0: 40960 5,-6: 0: 26214 6,-8: - 3: 21855 + 2: 21855 0: 160 6,-7: - 3: 15 + 2: 15 0: 56576 6,-6: 0: 61919 6,-9: - 3: 20480 + 2: 20480 0: 40960 7,-8: - 3: 21855 + 2: 21855 0: 160 7,-7: - 3: 11823 + 2: 11823 7,-5: 0: 36846 7,-9: - 3: 20767 + 2: 20767 0: 40960 7,-6: - 3: 546 + 2: 546 0: 32768 8,-8: - 3: 21855 + 2: 21855 0: 160 8,-7: - 3: 9007 + 2: 9007 8,-5: 0: 4017 -4,5: 0: 238 -4,6: 0: 255 - 3: 61440 + 2: 61440 -5,5: 0: 58982 -5,6: 0: 238 - 3: 61440 + 2: 61440 -3,5: 0: 3295 -3,6: 0: 255 - 3: 61440 + 2: 61440 -3,7: - 3: 51406 + 2: 51406 -3,8: - 3: 14 + 2: 14 0: 52224 -2,5: 0: 52701 @@ -749,51 +749,51 @@ entities: 0: 61166 -1,8: 0: 34952 - 3: 13104 + 2: 13104 -9,4: 0: 65471 -8,5: 0: 13072 - 3: 128 + 2: 128 -9,5: 0: 65459 -8,6: 0: 1 - 3: 63304 + 2: 63304 -9,6: 0: 59 - 3: 63488 + 2: 63488 -8,7: - 3: 2039 + 2: 2039 -9,7: - 3: 28671 + 2: 28671 -7,6: - 3: 63249 + 2: 63249 0: 14 -7,7: - 3: 16 + 2: 16 -7,5: 0: 1038 - 3: 4352 + 2: 4352 -6,5: 0: 65327 -6,6: 0: 255 - 3: 61440 + 2: 61440 -3,9: 0: 12 - 3: 3584 + 2: 3584 -2,8: 0: 30560 -2,9: 0: 7 - 3: 3840 + 2: 3840 -1,9: - 3: 405 + 2: 405 0,9: - 3: 240 + 2: 240 4,6: - 3: 550 + 2: 550 0: 34816 5,5: 0: 30583 @@ -803,24 +803,24 @@ entities: 0: 5 6,5: 0: 255 - 3: 61440 + 2: 61440 6,6: - 3: 35561 + 2: 35561 7,5: 0: 36063 - 3: 4096 + 2: 4096 7,6: - 3: 53196 + 2: 53196 8,4: 0: 4351 - 3: 57344 + 2: 57344 8,5: 0: 272 - 5: 17472 + 4: 17472 8,6: - 3: 4081 + 2: 4081 1,9: - 3: 18 + 2: 18 9,0: 0: 65102 9,1: @@ -831,7 +831,7 @@ entities: 0: 65535 9,4: 0: 255 - 3: 61440 + 2: 61440 9,-1: 0: 60942 10,0: @@ -846,52 +846,52 @@ entities: 0: 48015 10,4: 0: 255 - 3: 61440 + 2: 61440 11,0: 0: 65520 11,1: 0: 53759 11,2: 0: 4319 - 4: 49152 + 5: 49152 11,3: 0: 61457 - 4: 204 + 5: 204 11,-1: 0: 30583 11,4: 0: 255 - 3: 61440 + 2: 61440 12,0: 0: 65527 12,1: 0: 28791 12,2: 0: 119 - 4: 28672 + 5: 28672 12,3: - 4: 119 + 5: 119 0: 61440 12,-1: 0: 29311 12,4: 0: 255 - 3: 61440 + 2: 61440 13,0: 0: 49080 13,1: 0: 48058 13,2: - 3: 13104 + 2: 13104 0: 34826 13,3: - 3: 35059 + 2: 35059 0: 12288 13,-1: 0: 14119 13,4: 0: 51 - 3: 63624 + 2: 63624 14,0: 0: 48123 14,1: @@ -899,9 +899,9 @@ entities: 14,2: 0: 15235 14,3: - 3: 65528 + 2: 65528 14,4: - 3: 62455 + 2: 62455 15,0: 0: 56797 15,1: @@ -909,23 +909,23 @@ entities: 15,2: 0: 3548 15,3: - 3: 32767 + 2: 32767 15,4: - 3: 12850 + 2: 12850 15,-1: 0: 52701 16,0: 0: 13116 - 4: 52416 + 5: 52416 16,1: 0: 65484 16,2: - 3: 15 + 2: 15 0: 4080 16,3: - 3: 20479 + 2: 20479 8,-4: - 3: 8738 + 2: 8738 0: 34952 9,-4: 0: 56789 @@ -937,15 +937,15 @@ entities: 0: 18295 10,-4: 0: 65024 - 3: 14 + 2: 14 10,-3: 0: 65520 10,-2: 0: 63743 10,-5: - 3: 34956 + 2: 34956 11,-4: - 3: 2187 + 2: 2187 0: 13056 11,-3: 0: 43946 @@ -953,10 +953,10 @@ entities: 0: 30250 11,-5: 0: 32776 - 3: 17968 + 2: 17968 12,-4: 0: 7 - 3: 4088 + 2: 4088 12,-3: 0: 65535 12,-2: @@ -964,7 +964,7 @@ entities: -4,-8: 0: 4016 -4,-9: - 3: 28672 + 2: 28672 0: 127 -5,-8: 0: 2995 @@ -994,15 +994,15 @@ entities: 0: 57309 -2,-9: 0: 61440 - 3: 47 + 2: 47 -1,-6: 0: 30065 -8,-8: 0: 60931 - 3: 8 + 2: 8 -8,-9: 0: 12288 - 3: 35064 + 2: 35064 -9,-8: 0: 56653 -8,-7: @@ -1013,16 +1013,16 @@ entities: 0: 36863 -9,-6: 0: 3211 - 3: 12288 + 2: 12288 -8,-5: 0: 48123 -9,-5: 0: 43008 - 3: 4 + 2: 4 -8,-4: 0: 35771 -7,-8: - 3: 7 + 2: 7 0: 7936 -7,-6: 0: 61428 @@ -1033,7 +1033,7 @@ entities: -7,-4: 0: 36317 -7,-9: - 3: 17408 + 2: 17408 0: 32768 -6,-8: 0: 36747 @@ -1043,30 +1043,30 @@ entities: 0: 62463 -6,-9: 0: 61440 - 3: 34 + 2: 34 -6,-7: 0: 52878 -6,-4: 0: 62463 -5,-9: 0: 12799 - 3: 32768 + 2: 32768 -9,-4: 0: 34952 - 3: 800 + 2: 800 -8,-3: 0: 3663 -9,-3: 0: 52428 - 3: 4369 + 2: 4369 -8,-2: 0: 59119 -9,-2: 0: 52428 - 3: 4369 + 2: 4369 -9,-1: 0: 56780 - 3: 1 + 2: 1 -7,-2: 0: 65262 -7,-3: @@ -1086,11 +1086,11 @@ entities: -11,0: 0: 3855 -12,1: - 3: 2056 + 2: 2056 -11,2: 0: 3855 -11,1: - 3: 546 + 2: 546 0: 2184 -10,0: 0: 65535 @@ -1099,95 +1099,95 @@ entities: -10,2: 0: 53247 -11,3: - 3: 34952 + 2: 34952 -10,3: 0: 61166 -10,-1: 0: 60928 - 3: 15 + 2: 15 -10,4: 0: 61182 -12,-1: - 3: 2738 + 2: 2738 -11,-1: - 3: 3628 + 2: 3628 -11,-2: - 3: 32768 + 2: 32768 -10,-2: - 3: 4492 + 2: 4492 -10,-3: - 3: 57480 + 2: 57480 -10,-4: - 3: 136 + 2: 136 -10,-5: - 3: 32776 + 2: 32776 12,-5: 0: 62079 13,-4: - 3: 3064 + 2: 3064 13,-3: 0: 48059 13,-2: 0: 63243 13,-5: - 3: 39912 + 2: 39912 14,-4: - 3: 1039 + 2: 1039 14,-3: 0: 13107 - 3: 128 + 2: 128 14,-2: 0: 65283 14,-1: 0: 4095 14,-5: - 3: 17600 + 2: 17600 15,-4: - 3: 8739 + 2: 8739 15,-3: - 3: 62066 + 2: 62066 15,-2: 0: 7424 - 3: 206 + 2: 206 15,-5: - 3: 8721 + 2: 8721 16,-3: - 3: 61440 + 2: 61440 16,-2: - 3: 255 + 2: 255 0: 3840 16,-1: 0: 53247 8,-9: - 3: 24143 + 2: 24143 0: 41120 8,-6: - 3: 3618 + 2: 3618 9,-8: - 3: 15 + 2: 15 9,-7: - 3: 15 + 2: 15 9,-6: - 3: 3840 + 2: 3840 10,-8: - 3: 55703 + 2: 55703 10,-7: - 3: 8743 + 2: 8743 0: 34816 10,-6: - 3: 50978 + 2: 50978 0: 8 10,-9: - 3: 40847 + 2: 40847 11,-8: - 3: 54 + 2: 54 0: 2048 11,-7: 0: 64988 11,-6: 0: 3293 11,-9: - 3: 49921 + 2: 49921 12,-8: 0: 12144 12,-7: @@ -1195,78 +1195,78 @@ entities: 12,-6: 0: 24568 20,-1: - 3: 256 + 2: 256 19,-1: - 3: 65335 + 2: 65335 20,0: - 3: 16179 + 2: 16179 19,0: - 3: 39118 + 2: 39118 0: 17441 20,1: - 3: 14135 + 2: 14135 19,1: - 3: 39321 + 2: 39321 0: 17476 20,2: - 3: 29495 + 2: 29495 19,2: - 3: 53179 + 2: 53179 0: 8260 20,3: - 3: 35 + 2: 35 19,3: - 3: 4095 + 2: 4095 12,-9: - 3: 61440 + 2: 61440 13,-8: - 3: 35043 + 2: 35043 13,-7: 0: 64849 13,-6: 0: 349 - 3: 32768 + 2: 32768 13,-9: - 3: 4096 + 2: 4096 14,-8: - 3: 6144 + 2: 6144 14,-7: - 3: 8739 + 2: 8739 14,-6: - 3: 4898 + 2: 4898 15,-8: - 3: 4352 + 2: 4352 15,-7: - 3: 4369 + 2: 4369 15,-6: - 3: 4369 + 2: 4369 -11,4: 0: 192 - 3: 32768 + 2: 32768 -11,6: 0: 12 - 3: 34816 + 2: 34816 -11,7: - 3: 35840 + 2: 35840 -11,5: - 3: 2184 + 2: 2184 -10,6: 0: 4335 - 3: 57344 + 2: 57344 -10,7: - 3: 4040 + 2: 4040 -11,8: - 3: 34952 + 2: 34952 -10,5: 0: 61166 -9,8: 0: 2827 - 3: 25844 + 2: 25844 0,-12: - 3: 127 + 2: 127 0: 12288 -1,-12: - 3: 975 + 2: 975 0: 32768 0,-11: 0: 29107 @@ -1274,14 +1274,14 @@ entities: 0: 2047 0,-10: 0: 247 - 3: 57344 + 2: 57344 -1,-10: 0: 255 - 3: 36864 + 2: 36864 -1,-9: - 3: 3257 + 2: 3257 1,-12: - 3: 4375 + 2: 4375 1,-11: 0: 3536 1,-10: @@ -1291,254 +1291,254 @@ entities: 2,-10: 0: 14196 2,-12: - 3: 44800 + 2: 44800 3,-12: - 3: 768 + 2: 768 3,-10: - 3: 18240 + 2: 18240 3,-9: - 3: 1908 + 2: 1908 7,-12: - 3: 7455 + 2: 7455 7,-11: - 3: 7453 + 2: 7453 7,-10: - 3: 4381 + 2: 4381 8,-12: - 3: 20303 + 2: 20303 8,-11: - 3: 20303 + 2: 20303 8,-10: - 3: 20047 + 2: 20047 0: 40960 9,5: 6: 4368 - 4: 17472 + 5: 17472 9,6: - 3: 12272 + 2: 12272 10,5: - 4: 4368 + 5: 4368 7: 17472 10,6: - 3: 4080 + 2: 4080 11,5: - 4: 21840 + 5: 21840 11,6: - 3: 61424 + 2: 61424 11,7: - 3: 12 + 2: 12 12,5: - 3: 65535 + 2: 65535 12,6: - 3: 65535 + 2: 65535 12,7: - 3: 15 + 2: 15 13,5: - 3: 55705 + 2: 55705 13,6: - 3: 16383 + 2: 16383 13,7: - 3: 1 + 2: 1 14,5: - 3: 30591 + 2: 30591 14,6: - 3: 7 + 2: 7 15,5: - 3: 35 + 2: 35 -4,-11: - 3: 3840 + 2: 3840 -5,-11: - 3: 11776 + 2: 11776 -4,-10: 0: 6143 -5,-10: 0: 14472 - 3: 2 + 2: 2 -3,-11: - 3: 304 + 2: 304 0: 34944 -3,-10: 0: 29949 -2,-10: 0: 1019 -2,-11: - 3: 544 + 2: 544 0: 2176 -2,-12: - 3: 2048 + 2: 2048 17,-3: - 3: 61696 + 2: 61696 17,-2: - 3: 3327 + 2: 3327 0: 768 17,-1: 0: 4369 - 3: 52428 + 2: 52428 17,0: 0: 19969 - 3: 8 - 4: 4368 + 2: 8 + 5: 4368 18,-3: - 3: 4096 + 2: 4096 18,-2: - 3: 59381 + 2: 59381 18,-1: - 3: 15358 + 2: 15358 0: 33792 18,0: - 3: 65399 + 2: 65399 19,-2: - 3: 12288 + 2: 12288 17,1: 0: 65365 17,2: 0: 4095 17,3: - 3: 16383 + 2: 16383 18,1: - 3: 61167 + 2: 61167 18,2: 0: 1792 - 3: 2190 + 2: 2190 18,3: - 3: 40959 + 2: 40959 12,-10: - 3: 61440 + 2: 61440 11,-10: - 3: 61440 + 2: 61440 13,-10: - 3: 7936 + 2: 7936 14,-10: - 3: 256 + 2: 256 9,-12: - 3: 1807 + 2: 1807 9,-11: - 3: 1799 + 2: 1799 9,-10: - 3: 7 + 2: 7 9,-9: - 3: 3855 + 2: 3855 10,-12: - 3: 4369 + 2: 4369 10,-11: - 3: 4369 + 2: 4369 10,-10: - 3: 4369 + 2: 4369 -12,-8: - 3: 64170 + 2: 64170 -13,-8: - 3: 64170 + 2: 64170 -12,-7: - 3: 64170 + 2: 64170 -13,-7: - 3: 64170 + 2: 64170 -12,-9: - 3: 61440 + 2: 61440 -11,-8: - 3: 64170 + 2: 64170 -11,-7: - 3: 64170 + 2: 64170 -11,-9: - 3: 61440 + 2: 61440 -10,-8: - 3: 12834 + 2: 12834 0: 34828 -10,-7: - 3: 12834 + 2: 12834 0: 34952 -10,-9: - 3: 13288 + 2: 13288 0: 32768 -10,-6: - 3: 57378 + 2: 57378 0: 8 -9,-9: 0: 61440 - 3: 248 + 2: 248 -13,-9: - 3: 61440 + 2: 61440 -11,-10: - 3: 8 + 2: 8 -10,-10: - 3: 63631 + 2: 63631 -10,-12: - 3: 59592 + 2: 59592 -9,-12: - 3: 63743 + 2: 63743 -10,-11: - 3: 34952 + 2: 34952 -9,-11: - 3: 63736 + 2: 63736 -9,-10: - 3: 63736 + 2: 63736 -9,-13: - 3: 61440 + 2: 61440 -8,-12: - 3: 63743 + 2: 63743 -8,-11: - 3: 63736 + 2: 63736 -8,-10: - 3: 63736 + 2: 63736 -8,-13: - 3: 29696 + 2: 29696 -7,-12: - 3: 1808 + 2: 1808 -7,-11: - 3: 240 + 2: 240 -6,-11: - 3: 8192 + 2: 8192 -6,-10: - 3: 25262 + 2: 25262 -14,0: 0: 3598 -14,2: 0: 3598 -13,-1: - 3: 3648 + 2: 3648 -11,9: - 3: 35980 + 2: 35980 -11,10: - 3: 51336 + 2: 51336 -10,8: - 3: 497 + 2: 497 0: 3084 -10,9: - 3: 449 + 2: 449 0: 3084 -10,10: - 3: 4593 + 2: 4593 0: 3084 -10,11: - 3: 227 + 2: 227 -9,9: 0: 2827 - 3: 21748 + 2: 21748 -9,10: 0: 2827 - 3: 58612 + 2: 58612 -9,11: - 3: 254 + 2: 254 -8,8: 0: 1799 - 3: 112 + 2: 112 -8,9: 0: 1799 - 3: 4208 + 2: 4208 -8,10: 0: 1799 - 3: 112 + 2: 112 -8,11: - 3: 112 + 2: 112 -15,-8: - 3: 34944 + 2: 34944 -14,-8: - 3: 64443 + 2: 64443 -15,-7: - 3: 136 + 2: 136 -14,-7: - 3: 64443 + 2: 64443 -14,-9: - 3: 61440 + 2: 61440 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1571,10 +1571,8 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14975 + immutable: True moles: - - 20.078888 - - 75.53487 - 0 - 0 - 0 @@ -1585,11 +1583,13 @@ entities: - 0 - 0 - 0 - - volume: 2500 - immutable: True - moles: - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 - 0 - 0 - 0 @@ -1604,7 +1604,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -1619,7 +1619,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -1673,55 +1673,55 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 446: -12,-30 + 440: -12,-30 - node: color: '#FFFFFFFF' id: Arrows decals: - 383: 20,17 - 398: 20,17 - 402: 20,27 - 447: -12,-29 + 377: 20,17 + 392: 20,17 + 396: 20,27 + 441: -12,-29 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 399: 22,17 - 403: 22,27 + 393: 22,17 + 397: 22,27 - node: color: '#C3C3C3FF' id: Bot decals: - 757: -35,-24 - 762: -32,-32 - 763: -31,-32 + 704: -35,-24 + 709: -32,-32 + 710: -31,-32 - node: color: '#FFFFFFFF' id: Bot decals: - 377: -35,6 - 378: -30,11 - 408: -3,-31 - 613: 31,8 - 614: 31,9 + 375: -35,6 + 376: -30,11 + 402: -3,-31 + 566: 31,8 + 567: 31,9 - node: zIndex: 1 color: '#FFFFFFFF' id: Bot decals: - 481: 20,7 - 482: 21,7 - 483: 22,7 - 550: -7,-26 - 551: -6,-26 + 442: 20,7 + 443: 21,7 + 444: 22,7 + 511: -7,-26 + 512: -6,-26 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Bot decals: - 400: 20,17 - 401: 22,17 + 394: 20,17 + 395: 22,17 - node: color: '#FFFFFFFF' id: BotRight @@ -1732,577 +1732,577 @@ entities: color: '#C3C3C3FF' id: Box decals: - 775: -33,-29 - 776: -33,-28 + 722: -33,-29 + 723: -33,-28 - node: color: '#FFFFFFFF' id: Box decals: - 914: -33,21 - 915: -32,21 - 916: -32,24 - 917: -33,24 - 926: -31,23 - 927: -31,22 + 824: -33,21 + 825: -32,21 + 826: -32,24 + 827: -33,24 + 834: -31,23 + 835: -31,22 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 556: -9,-28 + 517: -9,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 557: -10,-28 + 518: -10,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 555: -9,-30 + 516: -9,-30 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 554: -10,-30 + 515: -10,-30 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 612: -11,20 + 565: -11,20 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 488: 6,17 + 449: 6,17 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 530: 0,-25 - 736: -1,29 - 737: -1,28 + 491: 0,-25 + 683: -1,29 + 684: -1,28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 558: -9,-29 + 519: -9,-29 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 525: -6,-23 - 526: -5,-23 - 527: -4,-23 - 734: 3,30 - 735: 4,30 + 486: -6,-23 + 487: -5,-23 + 488: -4,-23 + 681: 3,30 + 682: 4,30 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 565: 12,-14 - 566: 13,-14 - 567: 14,-14 - 568: 15,-14 + 526: 12,-14 + 527: 13,-14 + 528: 14,-14 + 529: 15,-14 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 609: -8,20 - 610: -9,20 - 611: -10,20 + 562: -8,20 + 563: -9,20 + 564: -10,20 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 484: 10,17 - 485: 9,17 - 486: 8,17 - 487: 7,17 + 445: 10,17 + 446: 9,17 + 447: 8,17 + 448: 7,17 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 569: 12,-18 - 570: 13,-18 - 571: 14,-18 - 572: 15,-18 + 530: 12,-18 + 531: 13,-18 + 532: 14,-18 + 533: 15,-18 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 531: -2,-25 + 492: -2,-25 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 559: -10,-29 + 520: -10,-29 - node: zIndex: 2 color: '#D381C9FF' id: BrickTileSteelCornerNe decals: - 553: -6,-26 + 514: -6,-26 - node: color: '#D381C9FF' id: BrickTileSteelCornerNw decals: - 539: -4,-26 + 500: -4,-26 - node: color: '#D381C9FF' id: BrickTileSteelCornerSe decals: - 545: -8,-24 + 506: -8,-24 - node: color: '#D381C9E5' id: BrickTileSteelCornerSw decals: - 437: -12,-32 + 431: -12,-32 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 625: 25,19 + 578: 25,19 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerNe decals: - 751: -34,-32 - 780: -35,-27 + 698: -34,-32 + 727: -35,-27 - node: color: '#D381C9E5' id: BrickTileSteelInnerNe decals: - 441: -10,-26 + 435: -10,-26 - node: color: '#D381C9FF' id: BrickTileSteelInnerNe decals: - 529: -6,-27 - 544: 0,-29 - 549: -13,-19 + 490: -6,-27 + 505: 0,-29 + 510: -13,-19 - node: color: '#D381C9FF' id: BrickTileSteelInnerNw decals: - 538: -4,-27 - 540: -3,-26 + 499: -4,-27 + 501: -3,-26 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerSe decals: - 761: -34,-30 - 771: -36,-28 - 772: -33,-30 + 708: -34,-30 + 718: -36,-28 + 719: -33,-30 - node: color: '#D381C9E5' id: BrickTileSteelInnerSe decals: - 431: -18,-28 - 434: -7,-33 + 425: -18,-28 + 428: -7,-33 - node: color: '#D381C9FF' id: BrickTileSteelInnerSe decals: - 541: 0,-26 - 546: -8,-23 + 502: 0,-26 + 507: -8,-23 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerSw decals: - 738: -34,-28 + 685: -34,-28 - node: color: '#D381C9E5' id: BrickTileSteelInnerSw decals: - 413: -12,-20 - 438: -12,-31 + 407: -12,-20 + 432: -12,-31 - node: color: '#C3C3C3FF' id: BrickTileSteelLineE decals: - 748: -33,-29 - 749: -33,-28 - 750: -34,-31 - 755: -35,-26 - 756: -35,-25 - 759: -33,-30 - 770: -36,-29 - 779: -36,-30 + 695: -33,-29 + 696: -33,-28 + 697: -34,-31 + 702: -35,-26 + 703: -35,-25 + 706: -33,-30 + 717: -36,-29 + 726: -36,-30 - node: color: '#D381C9FF' id: BrickTileSteelLineE decals: - 542: 0,-27 - 543: 0,-28 + 503: 0,-27 + 504: 0,-28 - node: color: '#C3C3C3FF' id: BrickTileSteelLineN decals: - 746: -37,-24 - 747: -36,-24 - 752: -33,-32 - 753: -33,-27 - 754: -34,-27 + 693: -37,-24 + 694: -36,-24 + 699: -33,-32 + 700: -33,-27 + 701: -34,-27 - node: color: '#D381C9E5' id: BrickTileSteelLineN decals: - 415: -8,-19 - 416: -9,-19 - 417: -10,-19 - 418: -11,-19 - 440: -9,-26 + 409: -8,-19 + 410: -9,-19 + 411: -10,-19 + 412: -11,-19 + 434: -9,-26 - node: color: '#D381C9FF' id: BrickTileSteelLineN decals: - 528: -8,-26 - 548: -12,-19 + 489: -8,-26 + 509: -12,-19 - node: zIndex: 2 color: '#D381C9FF' id: BrickTileSteelLineN decals: - 552: -7,-26 + 513: -7,-26 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 409: -11,-24 + 403: -11,-24 - node: color: '#C3C3C3FF' id: BrickTileSteelLineS decals: - 741: -33,-33 - 760: -33,-30 - 764: -34,-33 - 769: -37,-30 - 777: -35,-28 - 778: -36,-30 + 688: -33,-33 + 707: -33,-30 + 711: -34,-33 + 716: -37,-30 + 724: -35,-28 + 725: -36,-30 - node: color: '#D381C9E5' id: BrickTileSteelLineS decals: - 414: -13,-20 - 427: -17,-28 - 428: -16,-28 - 429: -15,-28 - 430: -14,-28 - 432: -5,-33 - 433: -6,-33 - 436: -11,-32 - 439: -13,-31 + 408: -13,-20 + 421: -17,-28 + 422: -16,-28 + 423: -15,-28 + 424: -14,-28 + 426: -5,-33 + 427: -6,-33 + 430: -11,-32 + 433: -13,-31 - node: color: '#D381C9FF' id: BrickTileSteelLineS decals: - 547: -9,-24 + 508: -9,-24 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 498: 57,5 - 499: 56,5 - 622: 26,19 - 623: 27,19 - 624: 28,19 + 459: 57,5 + 460: 56,5 + 575: 26,19 + 576: 27,19 + 577: 28,19 - node: color: '#C3C3C3FF' id: BrickTileSteelLineW decals: - 739: -34,-29 - 740: -34,-32 - 742: -37,-27 - 743: -37,-26 - 744: -37,-25 - 745: -37,-24 - 758: -34,-30 - 768: -37,-28 + 686: -34,-29 + 687: -34,-32 + 689: -37,-27 + 690: -37,-26 + 691: -37,-25 + 692: -37,-24 + 705: -34,-30 + 715: -37,-28 - node: color: '#D381C9E5' id: BrickTileSteelLineW decals: - 410: -12,-23 - 411: -12,-22 - 412: -12,-21 + 404: -12,-23 + 405: -12,-22 + 406: -12,-21 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 626: 25,20 - 627: 25,21 + 579: 25,20 + 580: 25,21 - node: color: '#689F54FF' id: BrickTileWhiteCornerNe decals: - 791: -21,-5 + 738: -21,-5 - node: color: '#689F54FF' id: BrickTileWhiteCornerNw decals: - 792: -23,-5 + 739: -23,-5 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 592: -8,7 + 547: -8,7 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 588: 7,-18 + 543: 7,-18 - node: color: '#A4610696' id: BrickTileWhiteCornerSw decals: - 632: 18,15 + 585: 18,15 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 593: -14,7 + 548: -14,7 - node: color: '#52B4E996' id: BrickTileWhiteEndE decals: - 512: 49,-12 + 473: 49,-12 - node: color: '#9FED5896' id: BrickTileWhiteEndE decals: - 508: 52,-10 + 469: 52,-10 - node: color: '#A4610696' id: BrickTileWhiteEndE decals: - 515: 52,-8 + 476: 52,-8 - node: color: '#D381C996' id: BrickTileWhiteEndE decals: - 511: 52,-12 + 472: 52,-12 - node: color: '#D4D4D496' id: BrickTileWhiteEndE decals: - 507: 49,-10 + 468: 49,-10 - node: color: '#EFB34196' id: BrickTileWhiteEndE decals: - 500: 49,-8 + 461: 49,-8 - node: color: '#334E6DC8' id: BrickTileWhiteEndN decals: - 502: 57,-8 + 463: 57,-8 - node: color: '#DE3A3A96' id: BrickTileWhiteEndN decals: - 505: 57,-11 + 466: 57,-11 - node: color: '#334E6DC8' id: BrickTileWhiteEndS decals: - 503: 57,-9 + 464: 57,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteEndS decals: - 504: 57,-12 + 465: 57,-12 - node: color: '#52B4E996' id: BrickTileWhiteEndW decals: - 513: 48,-12 + 474: 48,-12 - node: color: '#9FED5896' id: BrickTileWhiteEndW decals: - 509: 51,-10 + 470: 51,-10 - node: color: '#A4610696' id: BrickTileWhiteEndW decals: - 514: 51,-8 + 475: 51,-8 - node: color: '#D381C996' id: BrickTileWhiteEndW decals: - 510: 51,-12 + 471: 51,-12 - node: color: '#D4D4D496' id: BrickTileWhiteEndW decals: - 506: 48,-10 + 467: 48,-10 - node: color: '#EFB34196' id: BrickTileWhiteEndW decals: - 501: 48,-8 + 462: 48,-8 - node: color: '#759DBCFF' id: BrickTileWhiteInnerSe decals: - 975: 19,-18 + 879: 19,-18 - node: color: '#A4610696' id: BrickTileWhiteInnerSe decals: - 630: 22,15 + 583: 22,15 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 580: 17,-13 + 536: 17,-13 - node: color: '#A4610696' id: BrickTileWhiteInnerSw decals: - 631: 19,15 + 584: 19,15 - node: color: '#689F54FF' id: BrickTileWhiteLineE decals: - 789: -21,-8 - 790: -21,-7 + 736: -21,-8 + 737: -21,-7 - node: color: '#759DBCFF' id: BrickTileWhiteLineE decals: - 971: 19,-19 - 972: 20,-18 - 973: 20,-17 - 974: 20,-16 + 875: 19,-19 + 876: 20,-18 + 877: 20,-17 + 878: 20,-16 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineE decals: - 594: -8,8 + 549: -8,8 - node: color: '#689F54FF' id: BrickTileWhiteLineN decals: - 793: -22,-5 + 740: -22,-5 - node: color: '#759DBCFF' id: BrickTileWhiteLineN decals: - 979: 20,-16 - 980: 19,-16 - 981: 17,-16 + 883: 20,-16 + 884: 19,-16 + 885: 17,-16 - node: color: '#A4610696' id: BrickTileWhiteLineN decals: - 618: 26,10 - 619: 27,10 + 571: 26,10 + 572: 27,10 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineS decals: - 582: 8,-18 - 583: 9,-18 - 589: 10,-18 + 537: 8,-18 + 538: 9,-18 + 544: 10,-18 - node: color: '#759DBCFF' id: BrickTileWhiteLineS decals: - 976: 20,-18 - 977: 17,-19 - 978: 19,-19 + 880: 20,-18 + 881: 17,-19 + 882: 19,-19 - node: color: '#A4610696' id: BrickTileWhiteLineS decals: - 620: 26,8 - 621: 27,8 - 628: 24,15 - 629: 23,15 - 635: 26,15 - 636: 27,15 - 637: 28,15 + 573: 26,8 + 574: 27,8 + 581: 24,15 + 582: 23,15 + 588: 26,15 + 589: 27,15 + 590: 28,15 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineS decals: - 590: -9,7 - 591: -13,7 + 545: -9,7 + 546: -13,7 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineW decals: - 579: 17,-14 - 584: 7,-17 - 585: 7,-16 - 586: 7,-15 - 587: 7,-14 + 535: 17,-14 + 539: 7,-17 + 540: 7,-16 + 541: 7,-15 + 542: 7,-14 - node: color: '#689F54FF' id: BrickTileWhiteLineW decals: - 787: -23,-7 - 788: -23,-6 - 794: -23,-8 + 734: -23,-7 + 735: -23,-6 + 741: -23,-8 - node: color: '#759DBCFF' id: BrickTileWhiteLineW decals: - 968: 17,-19 - 969: 17,-18 - 970: 17,-17 - 982: 17,-16 + 872: 17,-19 + 873: 17,-18 + 874: 17,-17 + 886: 17,-16 - node: color: '#A4610696' id: BrickTileWhiteLineW decals: - 633: 18,16 - 634: 18,17 + 586: 18,16 + 587: 18,17 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 642: 48,-6 - 643: 48,-5 - 644: 48,-4 - 645: 48,-3 + 595: 48,-6 + 596: 48,-5 + 597: 48,-4 + 598: 48,-3 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineW decals: - 595: -14,8 + 550: -14,8 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 965: 18,-22 - 966: 18,-23 - 967: 18,-21 + 869: 18,-22 + 870: 18,-23 + 871: 18,-21 - node: color: '#FFFFFFFF' id: Caution decals: - 524: 58,-5 + 485: 58,-5 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -2354,8 +2354,8 @@ entities: color: '#FFFFFFFF' id: Delivery decals: - 435: -8,-33 - 533: -1,-31 + 429: -8,-33 + 494: -1,-31 - node: color: '#FFFFFFFF' id: DirtHeavy @@ -2367,23 +2367,23 @@ entities: color: '#FFFFFFFF' id: DirtHeavy decals: - 393: -24,-25 + 387: -24,-25 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtHeavy decals: - 597: -20,10 - 601: -20,9 - 602: -18,9 + 552: -20,10 + 556: -20,9 + 557: -18,9 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 600: -20,8 + 555: -20,8 - node: color: '#FFFFFFFF' id: DirtLight @@ -2430,25 +2430,25 @@ entities: 365: -36,1 366: -38,7 367: -40,8 - 370: -24,-9 - 371: -24,3 - 372: -25,2 - 373: -7,3 - 375: -36,8 - 376: -38,9 - 384: -23,-24 - 385: -25,-23 - 386: -23,-22 - 387: -25,-25 - 388: -24,-24 - 389: -24,-22 + 368: -24,-9 + 369: -24,3 + 370: -25,2 + 371: -7,3 + 373: -36,8 + 374: -38,9 + 378: -23,-24 + 379: -25,-23 + 380: -23,-22 + 381: -25,-25 + 382: -24,-24 + 383: -24,-22 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtLight decals: - 598: -19,9 + 553: -19,9 - node: color: '#FFFFFFFF' id: DirtMedium @@ -2464,18 +2464,18 @@ entities: 44: 24,17 65: 37,6 82: 53,1 - 374: -35,8 - 390: -23,-25 - 391: -25,-22 - 392: -25,-24 + 372: -35,8 + 384: -23,-25 + 385: -25,-22 + 386: -25,-24 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtMedium decals: - 596: -19,10 - 599: -19,8 + 551: -19,10 + 554: -19,8 - node: color: '#52B4E996' id: FullTileOverlayGreyscale @@ -2493,11 +2493,11 @@ entities: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 560: 9,-3 - 561: 9,-2 - 562: 10,-2 - 563: 8,-2 - 564: 9,-1 + 521: 9,-3 + 522: 9,-2 + 523: 10,-2 + 524: 8,-2 + 525: 9,-1 - node: color: '#EFB34196' id: FullTileOverlayGreyscale @@ -2537,19 +2537,19 @@ entities: color: '#AA4D53FF' id: HalfTileOverlayGreyscale decals: - 907: -32,19 - 908: -31,19 - 909: -30,19 + 817: -32,19 + 818: -31,19 + 819: -30,19 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale decals: - 808: -9,17 - 809: -8,17 - 810: -7,17 - 820: -11,11 - 821: -12,11 - 822: -13,11 + 752: -9,17 + 753: -8,17 + 754: -7,17 + 764: -11,11 + 765: -12,11 + 766: -13,11 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale @@ -2621,19 +2621,19 @@ entities: color: '#AA4D53FF' id: HalfTileOverlayGreyscale180 decals: - 897: -32,16 - 898: -31,16 - 899: -30,16 + 809: -32,16 + 810: -31,16 + 811: -30,16 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale180 decals: - 798: -7,10 - 799: -8,10 - 800: -9,10 - 817: -11,10 - 818: -12,10 - 819: -13,10 + 745: -7,10 + 746: -8,10 + 747: -9,10 + 761: -11,10 + 762: -12,10 + 763: -13,10 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 @@ -2697,19 +2697,19 @@ entities: color: '#AA4D53FF' id: HalfTileOverlayGreyscale270 decals: - 880: -10,15 - 881: -10,14 - 893: -10,16 - 894: -33,17 - 895: -33,16 - 910: -33,18 + 803: -10,15 + 804: -10,14 + 805: -10,16 + 806: -33,17 + 807: -33,16 + 820: -33,18 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale270 decals: - 802: -10,11 - 803: -10,12 - 804: -10,13 + 749: -10,11 + 750: -10,12 + 751: -10,13 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -2740,7 +2740,7 @@ entities: 185: 37,6 201: 42,8 202: 42,7 - 497: 55,2 + 458: 55,2 - node: color: '#FFD886FF' id: HalfTileOverlayGreyscale270 @@ -2778,7 +2778,7 @@ entities: 105: 12,1 307: 12,-9 308: 12,-10 - 654: 12,-11 + 601: 12,-11 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 @@ -2798,26 +2798,26 @@ entities: color: '#AA4D53FF' id: HalfTileOverlayGreyscale90 decals: - 903: -29,17 - 904: -29,18 - 911: -35,18 - 912: -35,19 - 913: -35,16 + 813: -29,17 + 814: -29,18 + 821: -35,18 + 822: -35,19 + 823: -35,16 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale90 decals: - 797: -5,8 - 811: -6,16 - 812: -6,15 - 816: -5,12 + 744: -5,8 + 755: -6,16 + 756: -6,15 + 760: -5,12 - node: color: '#C05B60FF' id: HalfTileOverlayGreyscale90 decals: - 845: -5,13 - 846: -5,11 - 858: -5,10 + 789: -5,13 + 790: -5,11 + 802: -5,10 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 @@ -2853,56 +2853,56 @@ entities: color: '#FFFFFFFF' id: LoadingArea decals: - 984: 31,-20 + 887: 31,-20 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: LoadingArea decals: - 985: 31,-18 + 888: 31,-18 - node: color: '#FFFFFFFF' id: MiniTileDarkLineN decals: - 407: -16,-25 + 401: -16,-25 - node: color: '#D381C9E5' id: MiniTileSteelCornerSe decals: - 419: -14,-23 + 413: -14,-23 - node: color: '#D381C9E5' id: MiniTileSteelCornerSw decals: - 425: -18,-24 + 419: -18,-24 - node: color: '#D381C9E5' id: MiniTileSteelInnerSe decals: - 420: -15,-23 + 414: -15,-23 - node: color: '#D381C9E5' id: MiniTileSteelInnerSw decals: - 426: -17,-24 + 420: -17,-24 - node: color: '#D381C9E5' id: MiniTileSteelLineE decals: - 421: -14,-22 + 415: -14,-22 - node: color: '#D381C9E5' id: MiniTileSteelLineW decals: - 422: -18,-21 - 423: -18,-22 - 424: -18,-23 + 416: -18,-21 + 417: -18,-22 + 418: -18,-23 - node: color: '#FFFFFFFF' id: MiniTileSteelLineW decals: - 825: -5,-13 - 826: -5,-12 + 769: -5,-13 + 770: -5,-12 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale @@ -2919,15 +2919,15 @@ entities: color: '#848586FF' id: QuarterTileOverlayGreyscale decals: - 931: -37,10 - 932: -37,13 - 933: -37,14 - 934: -37,15 - 935: -37,16 - 944: -37,20 - 945: -37,21 - 946: -37,22 - 947: -37,23 + 836: -37,10 + 837: -37,13 + 838: -37,14 + 839: -37,15 + 840: -37,16 + 849: -37,20 + 850: -37,21 + 851: -37,22 + 852: -37,23 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale @@ -2951,7 +2951,7 @@ entities: 187: 50,5 198: 44,9 203: 42,6 - 496: 55,1 + 457: 55,1 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 @@ -2964,14 +2964,14 @@ entities: color: '#848586FF' id: QuarterTileOverlayGreyscale180 decals: - 936: -37,13 - 937: -37,14 - 938: -37,15 - 939: -37,16 - 940: -37,20 - 941: -37,21 - 942: -37,22 - 943: -37,23 + 841: -37,13 + 842: -37,14 + 843: -37,15 + 844: -37,16 + 845: -37,20 + 846: -37,21 + 847: -37,22 + 848: -37,23 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -2981,7 +2981,7 @@ entities: color: '#AA4D53FF' id: QuarterTileOverlayGreyscale180 decals: - 896: -33,16 + 808: -33,16 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 @@ -3007,17 +3007,17 @@ entities: color: '#848586FF' id: QuarterTileOverlayGreyscale270 decals: - 954: -38,17 - 955: -38,18 - 956: -38,19 - 957: -36,19 - 958: -36,18 - 959: -36,17 + 859: -38,17 + 860: -38,18 + 861: -38,19 + 862: -36,19 + 863: -36,18 + 864: -36,17 - node: color: '#C05B60FF' id: QuarterTileOverlayGreyscale270 decals: - 857: -6,10 + 801: -6,10 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 @@ -3029,7 +3029,7 @@ entities: decals: 125: 35,-5 200: 42,9 - 495: 55,3 + 456: 55,3 - node: color: '#FFD886FF' id: QuarterTileOverlayGreyscale270 @@ -3046,12 +3046,12 @@ entities: color: '#848586FF' id: QuarterTileOverlayGreyscale90 decals: - 948: -36,19 - 949: -36,18 - 950: -36,17 - 951: -38,19 - 952: -38,18 - 953: -38,17 + 853: -36,19 + 854: -36,18 + 855: -36,17 + 856: -38,19 + 857: -38,18 + 858: -38,17 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 @@ -3088,18 +3088,18 @@ entities: color: '#8F6CFFAD' id: Rust decals: - 781: -31,-3 - 782: -30,-3 - 783: -30,0 - 784: -31,0 - 785: -31,1 - 786: -30,1 + 728: -31,-3 + 729: -30,-3 + 730: -30,0 + 731: -31,0 + 732: -31,1 + 733: -30,1 - node: color: '#FFFFFFFF' id: StandClear decals: - 396: 21,24 - 532: 1,-30 + 390: 21,24 + 493: 1,-30 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -3110,13 +3110,13 @@ entities: color: '#AA4D53FF' id: ThreeQuarterTileOverlayGreyscale decals: - 906: -33,19 + 816: -33,19 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale decals: - 815: -10,17 - 824: -14,11 + 759: -10,17 + 768: -14,11 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 @@ -3126,7 +3126,7 @@ entities: color: '#AA4D53FF' id: ThreeQuarterTileOverlayGreyscale180 decals: - 901: -29,16 + 812: -29,16 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 @@ -3136,8 +3136,8 @@ entities: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale270 decals: - 801: -10,10 - 823: -14,10 + 748: -10,10 + 767: -14,10 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 @@ -3147,18 +3147,18 @@ entities: color: '#AA4D53FF' id: ThreeQuarterTileOverlayGreyscale90 decals: - 905: -29,19 + 815: -29,19 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale90 decals: - 813: -5,14 - 814: -6,17 + 757: -5,14 + 758: -6,17 - node: color: '#FF0000FF' id: WarnBox decals: - 695: 69,2 + 642: 69,2 - node: color: '#FFFFFFFF' id: WarnBox @@ -3168,174 +3168,174 @@ entities: color: '#FF0000FF' id: WarnCornerNE decals: - 698: 68,3 + 645: 68,3 - node: color: '#FF0000FF' id: WarnCornerNW decals: - 699: 66,3 + 646: 66,3 - node: color: '#FF0000FF' id: WarnCornerSE decals: - 697: 68,1 + 644: 68,1 - node: color: '#FF0000FF' id: WarnCornerSW decals: - 696: 66,1 + 643: 66,1 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 963: -39,23 + 868: -39,23 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 962: -39,18 + 867: -39,18 - node: color: '#FFFFFFFF' id: WarnEndE decals: - 653: 12,-12 + 600: 12,-12 - node: color: '#FF0000FF' id: WarnEndN decals: - 694: 70,3 + 641: 70,3 - node: color: '#FF0000FF' id: WarnEndS decals: - 693: 70,2 + 640: 70,2 - node: color: '#FFFFFFFF' id: WarnEndW decals: - 652: 11,-12 + 599: 11,-12 - node: color: '#C3C3C3FF' id: WarnLineE decals: - 767: -36,-33 + 714: -36,-33 - node: color: '#FF0000FF' id: WarnLineE decals: - 667: 60,7 - 668: 60,6 - 700: 68,2 + 614: 60,7 + 615: 60,6 + 647: 68,2 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 442: -15,-30 - 443: -15,-31 - 516: 54,-4 - 517: 54,-5 - 518: 54,-6 - 656: 57,7 - 657: 57,6 - 658: 57,8 - 659: 57,5 - 660: 57,4 - 661: 57,3 - 662: 57,2 - 663: 57,1 - 664: 57,0 - 795: -21,-6 - 922: -32,23 - 923: -32,22 + 436: -15,-30 + 437: -15,-31 + 477: 54,-4 + 478: 54,-5 + 479: 54,-6 + 603: 57,7 + 604: 57,6 + 605: 57,8 + 606: 57,5 + 607: 57,4 + 608: 57,3 + 609: 57,2 + 610: 57,1 + 611: 57,0 + 742: -21,-6 + 832: -32,23 + 833: -32,22 - node: color: '#FF0000FF' id: WarnLineN decals: - 688: 62,0 - 689: 63,0 - 690: 63,5 - 691: 62,5 - 692: 67,1 + 635: 62,0 + 636: 63,0 + 637: 63,5 + 638: 62,5 + 639: 67,1 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 404: 20,26 - 405: 21,26 - 406: 22,26 - 519: 56,-4 - 520: 57,-4 - 521: 58,-4 - 522: 59,-4 - 523: 60,-4 - 534: -3,-29 - 535: -2,-29 - 536: -1,-29 - 537: 0,-29 - 703: 70,5 - 920: -33,22 - 921: -32,22 + 398: 20,26 + 399: 21,26 + 400: 22,26 + 480: 56,-4 + 481: 57,-4 + 482: 58,-4 + 483: 59,-4 + 484: 60,-4 + 495: -3,-29 + 496: -2,-29 + 497: -1,-29 + 498: 0,-29 + 650: 70,5 + 830: -33,22 + 831: -32,22 - node: color: '#C3C3C3FF' id: WarnLineS decals: - 765: -34,-33 - 766: -36,-33 - 773: -37,-30 - 774: -37,-29 + 712: -34,-33 + 713: -36,-33 + 720: -37,-30 + 721: -37,-29 - node: color: '#FF0000FF' id: WarnLineS decals: - 669: 62,10 - 670: 62,8 - 671: 62,9 - 672: 62,7 - 673: 62,6 - 674: 62,5 - 675: 62,4 - 676: 62,3 - 677: 62,2 - 678: 62,1 - 679: 62,0 - 680: 62,-1 - 681: 62,-2 - 682: 62,-3 - 683: 62,-4 - 701: 66,2 + 616: 62,10 + 617: 62,8 + 618: 62,9 + 619: 62,7 + 620: 62,6 + 621: 62,5 + 622: 62,4 + 623: 62,3 + 624: 62,2 + 625: 62,1 + 626: 62,0 + 627: 62,-1 + 628: 62,-2 + 629: 62,-3 + 630: 62,-4 + 648: 66,2 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 444: -17,-31 - 445: -17,-30 - 605: -15,18 - 606: -15,19 - 607: -15,20 - 608: -15,21 - 665: 59,7 - 666: 59,6 - 796: -19,-6 - 960: -39,17 - 961: -39,24 + 438: -17,-31 + 439: -17,-30 + 558: -15,18 + 559: -15,19 + 560: -15,20 + 561: -15,21 + 612: 59,7 + 613: 59,6 + 743: -19,-6 + 865: -39,17 + 866: -39,24 - node: color: '#FF0000FF' id: WarnLineW decals: - 684: 62,4 - 685: 63,4 - 686: 63,-1 - 687: 62,-1 - 702: 67,3 + 631: 62,4 + 632: 63,4 + 633: 63,-1 + 634: 62,-1 + 649: 67,3 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 394: 21,24 - 395: 22,24 - 397: 20,24 - 918: -33,23 - 919: -32,23 + 388: 21,24 + 389: 22,24 + 391: 20,24 + 828: -33,23 + 829: -32,23 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -3419,145 +3419,145 @@ entities: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 705: 0,1 - 830: -18,-11 - 844: 0,14 + 652: 0,1 + 774: -18,-11 + 788: 0,14 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 494: -4,-6 + 455: -4,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 704: -10,1 - 829: -21,-11 - 843: -4,14 + 651: -10,1 + 773: -21,-11 + 787: -4,14 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 706: 0,-7 - 831: -18,-13 - 847: 0,10 + 653: 0,-7 + 775: -18,-13 + 791: 0,10 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 708: -10,-2 - 832: -21,-13 - 842: -4,10 + 655: -10,-2 + 776: -21,-13 + 786: -4,10 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 707: -8,-2 + 654: -8,-2 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 720: 0,0 - 721: 0,-1 - 722: 0,-2 - 723: 0,-3 - 724: 0,-5 - 725: 0,-4 - 726: 0,-6 - 833: -18,-12 - 850: 0,11 - 851: 0,12 - 852: 0,13 + 667: 0,0 + 668: 0,-1 + 669: 0,-2 + 670: 0,-3 + 671: 0,-5 + 672: 0,-4 + 673: 0,-6 + 777: -18,-12 + 794: 0,11 + 795: 0,12 + 796: 0,13 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 493: -4,-7 - 615: 27,10 - 616: 27,9 - 617: 27,8 + 454: -4,-7 + 568: 27,10 + 569: 27,9 + 570: 27,8 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 577: 20,-12 + 534: 20,-12 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 711: -8,1 - 712: -9,1 - 713: -7,1 - 714: -6,1 - 715: -5,1 - 716: -4,1 - 717: -3,1 - 718: -2,1 - 719: -1,1 - 834: -19,-11 - 835: -20,-11 - 853: -1,14 - 854: -2,14 - 855: -3,14 + 658: -8,1 + 659: -9,1 + 660: -7,1 + 661: -6,1 + 662: -5,1 + 663: -4,1 + 664: -3,1 + 665: -2,1 + 666: -1,1 + 778: -19,-11 + 779: -20,-11 + 797: -1,14 + 798: -2,14 + 799: -3,14 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 489: -8,-6 - 490: -7,-6 - 491: -6,-6 - 492: -5,-6 + 450: -8,-6 + 451: -7,-6 + 452: -6,-6 + 453: -5,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 638: 37,0 - 639: 38,0 - 640: 39,0 - 641: 40,0 - 727: -1,-7 - 728: -2,-7 - 729: -3,-7 - 733: -9,-2 - 837: -20,-13 - 838: -19,-13 - 848: -1,10 - 849: -2,10 - 856: -3,10 + 591: 37,0 + 592: 38,0 + 593: 39,0 + 594: 40,0 + 674: -1,-7 + 675: -2,-7 + 676: -3,-7 + 680: -9,-2 + 781: -20,-13 + 782: -19,-13 + 792: -1,10 + 793: -2,10 + 800: -3,10 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 709: -10,-1 - 710: -10,0 - 730: -8,-5 - 731: -8,-4 - 732: -8,-3 - 827: -14,-12 - 828: -14,-11 - 836: -21,-12 - 839: -4,13 - 840: -4,12 - 841: -4,11 + 656: -10,-1 + 657: -10,0 + 677: -8,-5 + 678: -8,-4 + 679: -8,-3 + 771: -14,-12 + 772: -14,-11 + 780: -21,-12 + 783: -4,13 + 784: -4,12 + 785: -4,11 - node: color: '#FFFF00FF' id: radiation decals: - 655: 59,7 + 602: 59,7 - node: color: '#FFFFFFFF' id: space decals: - 986: -21,-33 + 889: -21,-33 - node: color: '#010102FF' id: taser decals: - 989: -34,19 + 890: -34,19 - type: OccluderTree - type: SpreaderGrid - type: Shuttle @@ -4332,7 +4332,7 @@ entities: pos: 3.5,22.5 parent: 31 - type: Door - secondsUntilStateChange: -32364.002 + secondsUntilStateChange: -32451.49 state: Opening - type: DeviceLinkSource lastSignals: @@ -28272,18 +28272,6 @@ entities: - type: Transform pos: 24.491184,-6.41413 parent: 31 -- proto: chem_master - entities: - - uid: 606 - components: - - type: Transform - pos: 19.5,-0.5 - parent: 31 - - uid: 5075 - components: - - type: Transform - pos: 15.5,1.5 - parent: 31 - proto: ChemDispenser entities: - uid: 5076 @@ -28303,6 +28291,18 @@ entities: - type: Transform pos: 18.5,1.5 parent: 31 +- proto: ChemMaster + entities: + - uid: 606 + components: + - type: Transform + pos: 19.5,-0.5 + parent: 31 + - uid: 5075 + components: + - type: Transform + pos: 15.5,1.5 + parent: 31 - proto: ChessBoard entities: - uid: 841 @@ -56679,7 +56679,7 @@ entities: - type: Transform pos: 54.5,-1.5 parent: 31 -- proto: LogicGate +- proto: LogicGateOr entities: - uid: 11306 components: @@ -57997,6 +57997,13 @@ entities: - type: Transform pos: -35.5,-16.5 parent: 31 +- proto: PlayerStationAi + entities: + - uid: 7046 + components: + - type: Transform + pos: 49.5,-24.5 + parent: 31 - proto: PlushieAtmosian entities: - uid: 7433 @@ -65856,7 +65863,7 @@ entities: - type: Transform pos: 12.820141,26.438648 parent: 31 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 1418 components: @@ -69250,12 +69257,6 @@ entities: - type: Transform pos: -28.5,18.5 parent: 31 - - uid: 7046 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 49.5,-24.5 - parent: 31 - uid: 8138 components: - type: Transform @@ -69964,11 +69965,6 @@ entities: parent: 31 - proto: ToyAi entities: - - uid: 8292 - components: - - type: Transform - pos: 49.509567,-24.29748 - parent: 31 - uid: 10982 components: - type: Transform diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index ed36325586c..6c169821ab9 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -224,6 +224,22 @@ unshaded: Empty: { state: ai_empty } Occupied: { state: ai } + - type: LanguageKnowledge + speaks: + - TauCetiBasic + - SolCommon + - Tradeband + - Freespeak + - Elyran + - RobotTalk + understands: + - TauCetiBasic + - SolCommon + - Tradeband + - Freespeak + - Elyran + - RobotTalk + - Sign # It's intentional that they don't "Speak" sign language. # The job-ready version of an AI spawn. - type: entity @@ -299,6 +315,22 @@ - state: default shader: unshaded map: ["base"] + - type: LanguageKnowledge + speaks: + - TauCetiBasic + - SolCommon + - Tradeband + - Freespeak + - Elyran + - RobotTalk + understands: + - TauCetiBasic + - SolCommon + - Tradeband + - Freespeak + - Elyran + - RobotTalk + - Sign # It's intentional that they don't "Speak" sign language. # Borgs - type: entity @@ -353,4 +385,4 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellHyper \ No newline at end of file + startingItem: PowerCellHyper diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 19e5c478d22..59e6b5fa4d7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -40,6 +40,7 @@ interfaces: enum.AtmosAlertsComputerUiKey.Key: type: AtmosAlertsComputerBoundUserInterface + - type: StationAiWhitelist - type: entity parent: BaseComputer @@ -297,6 +298,7 @@ interfaces: enum.PowerMonitoringConsoleUiKey.Key: type: PowerMonitoringConsoleBoundUserInterface + - type: StationAiWhitelist - type: entity parent: BaseComputer @@ -677,6 +679,7 @@ radius: 1.5 energy: 1.6 color: "#e6e227" + - type: StationAiWhitelist - type: entity parent: BaseComputer @@ -790,6 +793,7 @@ - type: GuideHelp guides: - Cargo + - type: StationAiWhitelist - type: entity id: ComputerCargoBounty @@ -1027,6 +1031,7 @@ - type: GuideHelp guides: - Cargo + - type: StationAiWhitelist - type: entity parent: BaseComputer diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 6090aae882f..3e972559603 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -111,6 +111,7 @@ collection: MetalGlassBreak params: volume: -4 + - type: StationAiWhitelist - type: entity id: AirAlarmAssembly diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index 9b26bbc3c17..26ae4a74ce9 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -62,4 +62,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 2 ] Passenger: [ -1, -1 ] - + #silicon + StationAi: [ 1, 1 ] From 0b0e9a8892d1df6e2fb72d81f3a5b51e64fc1f5e Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 29 Aug 2024 15:27:47 +1000 Subject: [PATCH 22/23] I managed to get both AI Latejoin and Prisoner Latejoin working at the same time --- .../Shuttles/Systems/ArrivalsSystem.cs | 17 +++++++++- .../ContainerSpawnPointSystem.cs | 24 ++++++++++---- .../Station/Systems/StationSpawningSystem.cs | 32 ------------------- Content.Shared/CCVar/CCVars.cs | 13 ++++++++ 4 files changed, 47 insertions(+), 39 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 9dabf6f40a0..f7b5f220e25 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -10,6 +10,7 @@ using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; using Content.Server.Spawners.Components; +using Content.Server.Spawners.EntitySystems; using Content.Server.Station.Components; using Content.Server.Station.Events; using Content.Server.Station.Systems; @@ -20,6 +21,7 @@ using Content.Shared.Movement.Components; using Content.Shared.Parallax.Biomes; using Content.Shared.Roles; +using Content.Shared.Preferences; using Content.Shared.Salvage; using Content.Shared.Shuttles.Components; using Content.Shared.Tiles; @@ -64,6 +66,11 @@ public sealed class ArrivalsSystem : EntitySystem /// public bool Enabled { get; private set; } + /// + /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal. + /// + public bool ArrivalsGodmode { get; private set; } + /// /// The first arrival is a little early, to save everyone 10s /// @@ -80,6 +87,8 @@ public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(ContainerSpawnPointSystem), typeof(SpawnPointSystem)}); + SubscribeLocalEvent(OnStationPostInit); SubscribeLocalEvent(OnShuttleStartup); @@ -95,7 +104,10 @@ public override void Initialize() // Don't invoke immediately as it will get set in the natural course of things. Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles); - Subs.CVar(_cfgManager, CCVars.ArrivalsShuttles, SetArrivals); + ArrivalsGodmode = _cfgManager.GetCVar(CCVars.GodmodeArrivals); + + _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals); + _cfgManager.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b); // Command so admins can set these for funsies _console.RegisterCommand("arrivals", ArrivalsCommand, ArrivalsCompletion); @@ -309,6 +321,9 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev) if (ev.SpawnResult != null) return; + if (ev.HumanoidCharacterProfile?.SpawnPriority != SpawnPriorityPreference.Arrivals) + return; + // Only works on latejoin even if enabled. if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound) return; diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs index 4d38571b90f..6b0033124e5 100644 --- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs @@ -1,8 +1,11 @@ using Content.Server.GameTicking; using Content.Server.Spawners.Components; using Content.Server.Station.Systems; +using Content.Shared.Preferences; +using Content.Shared.Roles; using Robust.Server.Containers; using Robust.Shared.Containers; +using Robust.Shared.Prototypes; using Robust.Shared.Random; namespace Content.Server.Spawners.EntitySystems; @@ -11,17 +14,25 @@ public sealed class ContainerSpawnPointSystem : EntitySystem { [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly ContainerSystem _container = default!; [Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem) }); + } + public void HandlePlayerSpawning(PlayerSpawningEvent args) { if (args.SpawnResult != null) return; - // DeltaV - Ignore these two desired spawn types - if (args.DesiredSpawnPointType is SpawnPointType.Observer or SpawnPointType.LateJoin) + // If it's just a spawn pref check if it's for cryo (silly). + if (args.HumanoidCharacterProfile?.SpawnPriority != SpawnPriorityPreference.Cryosleep && + (!_proto.TryIndex(args.Job?.Prototype, out var jobProto) || jobProto.JobEntity == null)) return; var query = EntityQueryEnumerator(); @@ -33,11 +44,12 @@ public void HandlePlayerSpawning(PlayerSpawningEvent args) continue; // DeltaV - Custom override for override spawnpoints, only used for prisoners currently. This shouldn't run for any other jobs - if (args.DesiredSpawnPointType == SpawnPointType.Job) + if (args.DesiredSpawnPointType == SpawnPointType.Job + && spawnPoint.SpawnType == SpawnPointType.Job + && args.Job is not null + && spawnPoint.Job is not "" + && spawnPoint.Job == args.Job.Prototype) { - if (spawnPoint.SpawnType != SpawnPointType.Job || spawnPoint.Job != args.Job?.Prototype) - continue; - possibleContainers.Add((uid, spawnPoint, container, xform)); continue; } diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 66a95549543..85f5662b421 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -53,19 +53,11 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem private bool _randomizeCharacters; - private Dictionary> _spawnerCallbacks = new(); - /// public override void Initialize() { base.Initialize(); Subs.CVar(_configurationManager, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true); - - _spawnerCallbacks = new Dictionary>() - { - { SpawnPriorityPreference.Arrivals, _arrivalsSystem.HandlePlayerSpawning }, - { SpawnPriorityPreference.Cryosleep, _containerSpawnPointSystem.HandlePlayerSpawning } - }; } /// @@ -88,31 +80,7 @@ public override void Initialize() var ev = new PlayerSpawningEvent(job, profile, station, spawnPointType); - if (station != null && profile != null) - { - // Try to call the character's preferred spawner first. - if (_spawnerCallbacks.TryGetValue(profile.SpawnPriority, out var preferredSpawner)) - { - preferredSpawner(ev); - - foreach (var (key, remainingSpawner) in _spawnerCallbacks) - { - if (key == profile.SpawnPriority) - continue; - - remainingSpawner(ev); - } - } - else - { - // Call all of them in the typical order. - foreach (var typicalSpawner in _spawnerCallbacks.Values) - typicalSpawner(ev); - } - } - RaiseLocalEvent(ev); - DebugTools.Assert(ev.SpawnResult is { Valid: true } or null); return ev.SpawnResult; diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index c93eaa77f90..28055d866e8 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1738,6 +1738,19 @@ public static readonly CVarDef public static readonly CVarDef ArrivalsReturns = CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY); + /// + /// Should all players who spawn at arrivals have godmode until they leave the map? + /// + public static readonly CVarDef GodmodeArrivals = + CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY); + + /// + /// If a grid is split then hide any smaller ones under this mass (kg) from the map. + /// This is useful to avoid split grids spamming out labels. + /// + public static readonly CVarDef HideSplitGridsUnder = + CVarDef.Create("shuttle.hide_split_grids_under", 30, CVar.SERVERONLY); + /// /// Whether to automatically spawn escape shuttles. /// From 5242ceb33ce0c553ae5dd5924e946f1c624b4a99 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 10 Jan 2025 23:24:22 -0500 Subject: [PATCH 23/23] Make AI Not Spawn With Clothes --- Content.Server/Traits/TraitSystem.cs | 3 +++ .../Clothing/Loadouts/Systems/SharedLoadoutSystem.cs | 2 ++ Content.Shared/Roles/JobPrototype.cs | 6 ++++++ Resources/Prototypes/Roles/Jobs/Science/borg.yml | 4 +++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 3e0866a2bab..57103c4a5d0 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -48,6 +48,9 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args) { var pointsTotal = _configuration.GetCVar(CCVars.GameTraitsDefaultPoints); var traitSelections = _configuration.GetCVar(CCVars.GameTraitsMax); + if (args.JobId is not null && !_prototype.TryIndex(args.JobId, out var jobPrototype) + && jobPrototype is not null && !jobPrototype.ApplyTraits) + return; foreach (var traitId in args.Profile.TraitPreferences) { diff --git a/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs index e759c904af2..865908c7069 100644 --- a/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs +++ b/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs @@ -75,6 +75,8 @@ private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent a var failedLoadouts = new List(); var allLoadouts = new List<(EntityUid, LoadoutPreference, int)>(); heirlooms = new(); + if (!job.SpawnLoadout) + return (failedLoadouts, allLoadouts); foreach (var loadout in profile.LoadoutPreferences) { diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index 8b21ffef206..5ea9da02247 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -134,6 +134,12 @@ public sealed partial class JobPrototype : IPrototype [DataField] public bool Whitelisted; + + [DataField] + public bool SpawnLoadout = true; + + [DataField] + public bool ApplyTraits = true; } /// diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 0c60faccfa4..91ee25357eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -13,6 +13,8 @@ supervisors: job-supervisors-rd jobEntity: StationAiBrain nameDataset: NamesAI + spawnLoadout: false + applyTraits: false - type: job id: Borg @@ -25,4 +27,4 @@ canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd - jobEntity: PlayerBorgGeneric \ No newline at end of file + jobEntity: PlayerBorgGeneric