+^YT{!mR5m1y!Z@s>2vb9>dR<7*_(~AZ`FZfK-JL9nk z09e*v9B03kU*5l3YA%;J85)*;fmK!64wDfQ#yO`{@4z!{8pg joZ}+li-6-e%*LXg zHhR%;M3>Gm_ Px)b4f%&RA_ ~;460Mqen>~;4udfTxR zy3yn%rsLO0<1c?x1{na@4M#ii!O+EE=q@mKy9@ryG4^)58NJ ~LArDWs6O;=Hyq~A zJW-^hfGzPwX$1hl!0jh0VBq#M L5mL{ z7a$SNgR)Wv0EF`Z{?$LC_3&}xbT=5fVx!q&or5E7HgAJJQvqpm0BAqjf JLf*Wc7A|-<&7TNB6o$pXQSo?HyF8xT;7 x(#!V}uADvIoKj~q8y~)CPp!F@|H)>qtl@*;`9)H5p zZaDZ91PLel1493zxM>wGV#~=3Zd&rFy4l{AHlKnZbBe3VA4d`LxYcinqX e|>bMFCw#j%sf+mE)e+1^GRg@yh_{6?)N z@~Vd -YUd5o_ z)621d<`7oK@6Wu_HlQ7VvRuZW*#^l-*Momg|CB-SKD-k(&IJHb<6L+j-ig-3#|b-C z2u~N(s{BCt3ZFNg$DauR3EifUvp@4tw;N3D$-UjKd??} fLViGD|6-o1# z$xinWKmGa}YJ628RrsZK6ov_B9r0&>hPAu**~REg*bOH$ela@3+THu?>f`&;k5BLU zRrrg9o7Q4|YB-=xNWDSI<6i|J3Na7#7bB`%eS8mYTH2dgZd!@S=ZUVDtMcawV@Bfs z09f7r6!FUzDC#ZBEU@~^>d!n(FURts0}PEXDr0+c^^DFZ@+lJHlW8z& zJo6DW0V->nTsRNFO^Z?4E_MM6v_-vepJS(cDBA_d-r%GwpoqVU=vqj{$m5qDwHk+2 zPhN9ztIopUGt|ig)h;e52mlzj>VVQRcEic60Y&@(L|HKC7_BaL{>+16)R?gdjFw-v zfNu5V+{6p_`G3BtAz#kT1a6wIh<_ Date: Mon, 9 Dec 2024 08:41:01 +0400 Subject: [PATCH 5/5] Night and thermal vision device (#104) * first * fix * fix * Apply suggestions from code review Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> * fix * Apply suggestions from code review * fix --------- Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com> Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- .../Overlays/BaseSwitchableOverlay.cs | 47 +++++++ .../_CorvaxNext/Overlays/NightVisionSystem.cs | 85 ++++++++++++ .../Overlays/ThermalVisionOverlay.cs | 130 ++++++++++++++++++ .../Overlays/ThermalVisionSystem.cs | 81 +++++++++++ .../_CorvaxNext/Overlays/NightVisionSystem.cs | 5 + .../Overlays/ThermalVisionSystem.cs | 5 + .../ClothingGrantComponentComponent.cs | 14 ++ .../Components/ClothingGrantTagComponent.cs | 10 ++ .../Systems/ClothingGrantingSystem.cs | 92 +++++++++++++ .../Overlays/BaseOverlayComponent.cs | 16 +++ .../Overlays/NightVisionComponent.cs | 15 ++ .../Overlays/SwitchableOverlayComponent.cs | 24 ++++ .../Overlays/SwitchableOverlaySystem.cs | 52 +++++++ .../Overlays/ThermalInvisibilityComponent.cs | 7 + .../Overlays/ThermalVisionComponent.cs | 14 ++ .../_CorvaxNext/Items/Goggles/activate.ogg | Bin 0 -> 12048 bytes .../Items/Goggles/attributions.yml | 9 ++ .../_CorvaxNext/Items/Goggles/deactivate.ogg | Bin 0 -> 12424 bytes .../_corvaxnext/store/uplink-catalog.ftl | 5 + .../entities/clothing/eyes/goggles.ftl | 15 ++ .../_CorvaxNext/prototypes/actions/types.ftl | 5 + .../_CorvaxNext/store/uplink-catalog.ftl | 5 + .../Mobs/Cyborgs/base_borg_chassis.yml | 1 + .../Entities/Mobs/Player/admin_ghost.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 8 +- .../Prototypes/_CorvaxNext/Actions/types.yml | 25 ++++ .../_CorvaxNext/Catalog/uplink_catalog.yml | 63 +++++++++ .../Entities/Clothing/Eyes/goggles.yml | 71 ++++++++++ .../_CorvaxNext/Research/experimental.yml | 2 + .../_CorvaxNext/Shaders/shaders.yml | 4 + .../nightvision.rsi/equipped-EYES-off.png | Bin 0 -> 452 bytes .../Goggles/nightvision.rsi/equipped-EYES.png | Bin 0 -> 719 bytes .../Eyes/Goggles/nightvision.rsi/icon.png | Bin 0 -> 218 bytes .../Goggles/nightvision.rsi/inhand-left.png | Bin 0 -> 385 bytes .../Goggles/nightvision.rsi/inhand-right.png | Bin 0 -> 410 bytes .../Eyes/Goggles/nightvision.rsi/meta.json | 48 +++++++ .../Goggles/thermal.rsi/equipped-EYES.png | Bin 0 -> 524 bytes .../Eyes/Goggles/thermal.rsi/icon.png | Bin 0 -> 510 bytes .../Eyes/Goggles/thermal.rsi/inhand-left.png | Bin 0 -> 327 bytes .../Eyes/Goggles/thermal.rsi/inhand-right.png | Bin 0 -> 325 bytes .../Eyes/Goggles/thermal.rsi/meta.json | 26 ++++ .../_CorvaxNext/Shaders/nightvision.swsl | 40 ++++++ 42 files changed, 922 insertions(+), 3 deletions(-) create mode 100644 Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs create mode 100644 Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs create mode 100644 Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs create mode 100644 Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs create mode 100644 Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs create mode 100644 Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs create mode 100644 Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs create mode 100644 Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs create mode 100644 Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs create mode 100644 Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs create mode 100644 Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs create mode 100644 Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs create mode 100644 Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs create mode 100644 Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs create mode 100644 Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs create mode 100644 Resources/Audio/_CorvaxNext/Items/Goggles/activate.ogg create mode 100644 Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml create mode 100644 Resources/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg create mode 100644 Resources/Locale/en-US/_corvaxnext/store/uplink-catalog.ftl create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/prototypes/actions/types.ftl create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/store/uplink-catalog.ftl create mode 100644 Resources/Prototypes/_CorvaxNext/Actions/types.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Clothing/Eyes/goggles.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Shaders/shaders.yml create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/equipped-EYES-off.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/icon.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/inhand-left.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/inhand-right.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/icon.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/inhand-left.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/inhand-right.png create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxNext/Shaders/nightvision.swsl diff --git a/Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs b/Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs new file mode 100644 index 00000000000..5910ae4a836 --- /dev/null +++ b/Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs @@ -0,0 +1,47 @@ +using Content.Shared._CorvaxNext.Overlays; +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Enums; +using Robust.Shared.Prototypes; +using System.Numerics; + +namespace Content.Client._CorvaxNext.Overlays; + +public class BaseSwitchableOverlay : Overlay + where TComp : SwitchableOverlayComponent +{ + [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IEntityManager _entity = default!; + + public override bool RequestScreenTexture => true; + public override OverlaySpace Space => OverlaySpace.WorldSpace; + private readonly ShaderInstance _shader; + + public BaseSwitchableOverlay() + { + IoCManager.InjectDependencies(this); + _shader = _prototype.Index ("NightVision").Instance().Duplicate(); + } + + protected override void Draw(in OverlayDrawArgs args) + { + if (ScreenTexture is null + || _player.LocalEntity is null + || !_entity.TryGetComponent (_player.LocalEntity.Value, out var component) + || !component.IsActive) + return; + + _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture); + _shader.SetParameter("tint", component.Tint); + _shader.SetParameter("luminance_threshold", component.Strength); + _shader.SetParameter("noise_amount", component.Noise); + + var worldHandle = args.WorldHandle; + + worldHandle.SetTransform(Matrix3x2.Identity); + worldHandle.UseShader(_shader); + worldHandle.DrawRect(args.WorldBounds, component.Color); + worldHandle.UseShader(null); + } +} diff --git a/Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs b/Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs new file mode 100644 index 00000000000..1b8909a1540 --- /dev/null +++ b/Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs @@ -0,0 +1,85 @@ +using Content.Shared._CorvaxNext.Overlays; +using Content.Shared.GameTicking; +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Player; + +namespace Content.Client._CorvaxNext.Overlays; + +public sealed class NightVisionSystem : SwitchableOverlaySystem +{ + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private readonly ILightManager _lightManager = default!; + + private BaseSwitchableOverlay _overlay = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent (OnPlayerAttached); + SubscribeLocalEvent (OnPlayerDetached); + SubscribeLocalEvent (OnRestart); + + _overlay = new BaseSwitchableOverlay (); + } + + private void OnPlayerAttached(EntityUid uid, NightVisionComponent component, PlayerAttachedEvent args) + { + if (!component.IsActive) + return; + + UpdateVision(args.Player, component.IsActive); + } + + private void OnPlayerDetached(EntityUid uid, NightVisionComponent component, PlayerDetachedEvent args) + { + UpdateVision(args.Player, false); + } + + private void OnRestart(RoundRestartCleanupEvent ev) + { + _overlayMan.RemoveOverlay(_overlay); + _lightManager.DrawLighting = true; + } + + protected override void UpdateVision(EntityUid uid, bool active) + { + if (_player.LocalSession?.AttachedEntity != uid) + return; + + UpdateOverlay(active); + UpdateNightVision(active); + } + + private void UpdateVision(ICommonSession player, bool active) + { + if (_player.LocalSession != player) + return; + + UpdateOverlay(active); + UpdateNightVision(active); + } + + private void UpdateNightVision(bool active) + { + _lightManager.DrawLighting = !active; + } + + private void UpdateOverlay(bool active) + { + if (_player.LocalEntity == null) + { + _overlayMan.RemoveOverlay(_overlay); + return; + } + + active |= TryComp (_player.LocalEntity.Value, out var component) && component.IsActive; + + if (active) + _overlayMan.AddOverlay(_overlay); + else + _overlayMan.RemoveOverlay(_overlay); + } +} diff --git a/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs b/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs new file mode 100644 index 00000000000..6d7018a73b5 --- /dev/null +++ b/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs @@ -0,0 +1,130 @@ +using System.Linq; +using System.Numerics; +using Content.Client.Stealth; +using Content.Shared._CorvaxNext.Overlays; +using Content.Shared.Body.Components; +using Content.Shared.Stealth.Components; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Enums; +using Robust.Shared.Map; + +namespace Content.Client._CorvaxNext.Overlays; + +public sealed class ThermalVisionOverlay : Overlay +{ + [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private readonly IPlayerManager _players = default!; + + private readonly TransformSystem _transform; + private readonly OccluderSystem _occluder; + private readonly StealthSystem _stealth; + private readonly ContainerSystem _container; + + public override bool RequestScreenTexture => true; + public override OverlaySpace Space => OverlaySpace.WorldSpace; + + private readonly List _entries = []; + + public ThermalVisionOverlay() + { + IoCManager.InjectDependencies(this); + + _container = _entity.System (); + _transform = _entity.System (); + _occluder = _entity.System (); + _stealth = _entity.System (); + + ZIndex = -1; + } + + protected override void Draw(in OverlayDrawArgs args) + { + if (ScreenTexture is null + || _players.LocalEntity is null + || !_entity.TryGetComponent (_players.LocalEntity.Value, out var component) + || !component.IsActive) + return; + + var worldHandle = args.WorldHandle; + var eye = args.Viewport.Eye; + + if (eye is null) + return; + + var mapId = eye.Position.MapId; + var eyeRot = eye.Rotation; + + _entries.Clear(); + var entities = _entity.EntityQueryEnumerator (); + while (entities.MoveNext(out var uid, out var body, out var sprite, out var xform)) + { + if (!CanSee(uid, sprite, body)) + continue; + + var entity = uid; + + if (_container.TryGetOuterContainer(uid, xform, out var container)) + { + var owner = container.Owner; + if (_entity.TryGetComponent (owner, out var ownerSprite) + && _entity.TryGetComponent (owner, out var ownerXform)) + { + entity = owner; + sprite = ownerSprite; + xform = ownerXform; + } + } + + if (_entries.Any(e => e.Ent.Item1 == entity)) + continue; + + _entries.Add(new ThermalVisionRenderEntry((entity, sprite, xform, body), mapId, eyeRot)); + } + + foreach (var entry in _entries) + { + Render(entry.Ent, entry.Map, worldHandle, entry.EyeRot); + } + + worldHandle.SetTransform(Matrix3x2.Identity); + } + + private void Render(Entity ent, + MapId? map, + DrawingHandleWorld handle, + Angle eyeRot) + { + var (uid, sprite, xform, body) = ent; + if (xform.MapID != map || HasOccluders(uid) || !CanSee(uid, sprite, body)) + return; + + var position = _transform.GetWorldPosition(xform); + var rotation = _transform.GetWorldRotation(xform); + + sprite.Render(handle, eyeRot, rotation, position: position); + } + + private bool CanSee(EntityUid uid, SpriteComponent sprite, BodyComponent body) + { + return sprite.Visible + && !_entity.HasComponent (uid) + && (!_entity.TryGetComponent(uid, out StealthComponent? stealth) + || _stealth.GetVisibility(uid, stealth) > 0.5f); + } + + private bool HasOccluders(EntityUid uid) + { + var mapCoordinates = _transform.GetMapCoordinates(uid); + var occluders = _occluder.QueryAabb(mapCoordinates.MapId, + Box2.CenteredAround(mapCoordinates.Position, new Vector2(0.3f, 0.3f))); + + return occluders.Any(o => o.Component.Enabled); + } +} + +public record struct ThermalVisionRenderEntry( + (EntityUid, SpriteComponent, TransformComponent, BodyComponent) Ent, + MapId? Map, + Angle EyeRot); diff --git a/Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs b/Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs new file mode 100644 index 00000000000..ce3713c4be3 --- /dev/null +++ b/Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs @@ -0,0 +1,81 @@ +using Content.Shared._CorvaxNext.Overlays; +using Content.Shared.GameTicking; +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Player; + +namespace Content.Client._CorvaxNext.Overlays; + +public sealed class ThermalVisionSystem : SwitchableOverlaySystem +{ + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IOverlayManager _overlayMan = default!; + + private ThermalVisionOverlay _thermalOverlay = default!; + private BaseSwitchableOverlay _overlay = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent (OnPlayerAttached); + SubscribeLocalEvent (OnPlayerDetached); + SubscribeLocalEvent (OnRestart); + + _thermalOverlay = new ThermalVisionOverlay(); + _overlay = new BaseSwitchableOverlay (); + } + + private void OnPlayerAttached(EntityUid uid, ThermalVisionComponent component, PlayerAttachedEvent args) + { + if (!component.IsActive) + return; + + UpdateVision(args.Player, component.IsActive); + } + + private void OnPlayerDetached(EntityUid uid, ThermalVisionComponent component, PlayerDetachedEvent args) + { + UpdateVision(args.Player, false); + } + + private void OnRestart(RoundRestartCleanupEvent ev) + { + _overlayMan.RemoveOverlay(_thermalOverlay); + _overlayMan.RemoveOverlay(_overlay); + } + + protected override void UpdateVision(EntityUid uid, bool active) + { + if (_player.LocalSession?.AttachedEntity != uid) + return; + + UpdateOverlay(active, _thermalOverlay); + UpdateOverlay(active, _overlay); + } + + private void UpdateVision(ICommonSession player, bool active) + { + if (_player.LocalSession != player) + return; + + UpdateOverlay(active, _thermalOverlay); + UpdateOverlay(active, _overlay); + } + + private void UpdateOverlay(bool active, Overlay overlay) + { + if (_player.LocalEntity == null) + { + _overlayMan.RemoveOverlay(overlay); + return; + } + + active |= TryComp (_player.LocalEntity.Value, out var component) && component.IsActive; + + if (active) + _overlayMan.AddOverlay(overlay); + else + _overlayMan.RemoveOverlay(overlay); + } +} diff --git a/Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs b/Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs new file mode 100644 index 00000000000..b38deb2d0b7 --- /dev/null +++ b/Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared._CorvaxNext.Overlays; + +namespace Content.Server._CorvaxNext.Overlays; + +public sealed class NightVisionSystem : SwitchableOverlaySystem ; diff --git a/Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs b/Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs new file mode 100644 index 00000000000..6cffd8314d9 --- /dev/null +++ b/Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared._CorvaxNext.Overlays; + +namespace Content.Server._CorvaxNext.Overlays; + +public sealed class ThermalVisionSystem : SwitchableOverlaySystem ; diff --git a/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs new file mode 100644 index 00000000000..ff2e2a2cbca --- /dev/null +++ b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs @@ -0,0 +1,14 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared._CorvaxNext.Clothing +{ + [RegisterComponent] + public sealed partial class ClothingGrantComponentComponent : Component + { + [DataField("component")] + [AlwaysPushInheritance] + public ComponentRegistry Components { get; private set; } = new(); + + public bool IsActive = false; + } +} diff --git a/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs new file mode 100644 index 00000000000..27190765295 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared._CorvaxNext.Clothing; + +[RegisterComponent] +public sealed partial class ClothingGrantTagComponent : Component +{ + [DataField("tag")] + public string Tag = ""; + + public bool IsActive = false; +} diff --git a/Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs b/Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs new file mode 100644 index 00000000000..97044a34030 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs @@ -0,0 +1,92 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Inventory.Events; +using Robust.Shared.Serialization.Manager; +using Content.Shared.Tag; + +namespace Content.Shared._CorvaxNext.Clothing; + +public sealed class ClothingGrantingSystem : EntitySystem +{ + [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private readonly ISerializationManager _serializationManager = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent (OnCompEquip); + SubscribeLocalEvent (OnCompUnequip); + + SubscribeLocalEvent (OnTagEquip); + SubscribeLocalEvent (OnTagUnequip); + } + + private void OnCompEquip(EntityUid uid, ClothingGrantComponentComponent component, GotEquippedEvent args) + { + if (!TryComp (uid, out var clothing)) return; + + if (!clothing.Slots.HasFlag(args.SlotFlags)) return; + + if (component.Components.Count > 1) + { + Logger.Error("Although a component registry supports multiple components, we cannot bookkeep more than 1 component for ClothingGrantComponent at this time."); + return; + } + + foreach (var (name, data) in component.Components) + { + var newComp = (Component) _componentFactory.GetComponent(name); + + if (HasComp(args.Equipee, newComp.GetType())) + continue; + + newComp.Owner = args.Equipee; + + var temp = (object) newComp; + _serializationManager.CopyTo(data.Component, ref temp); + EntityManager.AddComponent(args.Equipee, (Component)temp!); + + component.IsActive = true; + } + } + + private void OnCompUnequip(EntityUid uid, ClothingGrantComponentComponent component, GotUnequippedEvent args) + { + if (!component.IsActive) return; + + foreach (var (name, data) in component.Components) + { + var newComp = (Component) _componentFactory.GetComponent(name); + + RemComp(args.Equipee, newComp.GetType()); + } + + component.IsActive = false; + } + + + private void OnTagEquip(EntityUid uid, ClothingGrantTagComponent component, GotEquippedEvent args) + { + if (!TryComp (uid, out var clothing)) + return; + + if (!clothing.Slots.HasFlag(args.SlotFlags)) + return; + + EnsureComp (args.Equipee); + _tagSystem.AddTag(args.Equipee, component.Tag); + + component.IsActive = true; + } + + private void OnTagUnequip(EntityUid uid, ClothingGrantTagComponent component, GotUnequippedEvent args) + { + if (!component.IsActive) + return; + + _tagSystem.RemoveTag(args.Equipee, component.Tag); + + component.IsActive = false; + } +} diff --git a/Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs b/Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs new file mode 100644 index 00000000000..4d5ad8b4727 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs @@ -0,0 +1,16 @@ +namespace Content.Shared._CorvaxNext.Overlays; + +public abstract partial class BaseOverlayComponent : Component +{ + [DataField, ViewVariables(VVAccess.ReadOnly)] + public virtual Vector3 Tint { get; set; } = new(0.3f, 0.3f, 0.3f); + + [DataField, ViewVariables(VVAccess.ReadOnly)] + public virtual float Strength { get; set; } = 2f; + + [DataField, ViewVariables(VVAccess.ReadOnly)] + public virtual float Noise { get; set; } = 0.5f; + + [DataField, ViewVariables(VVAccess.ReadOnly)] + public virtual Color Color { get; set; } = Color.White; +} diff --git a/Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs b/Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs new file mode 100644 index 00000000000..084f7448568 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs @@ -0,0 +1,15 @@ +using Content.Shared.Actions; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared._CorvaxNext.Overlays; + +[RegisterComponent, NetworkedComponent] +public sealed partial class NightVisionComponent : SwitchableOverlayComponent +{ + public override string? ToggleAction { get; set; } = "ToggleNightVision"; + + public override Color Color { get; set; } = Color.FromHex("#98FB98"); +} + +public sealed partial class ToggleNightVisionEvent : InstantActionEvent; diff --git a/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs new file mode 100644 index 00000000000..89a99a283f0 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs @@ -0,0 +1,24 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared._CorvaxNext.Overlays; + +public abstract partial class SwitchableOverlayComponent : BaseOverlayComponent +{ + [DataField, AutoNetworkedField] + public bool IsActive = true; + + [DataField] + public virtual SoundSpecifier? ActivateSound { get; set; } = + new SoundPathSpecifier("/Audio/_CorvaxNext/Items/Goggles/activate.ogg"); + + [DataField] + public virtual SoundSpecifier? DeactivateSound { get; set; } = + new SoundPathSpecifier("/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg"); + + [DataField] + public virtual string? ToggleAction { get; set; } + + [ViewVariables] + public EntityUid? ToggleActionEntity; +} diff --git a/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs new file mode 100644 index 00000000000..062fa177264 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs @@ -0,0 +1,52 @@ +using Content.Shared.Actions; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; +using Robust.Shared.Player; +using Robust.Shared.Timing; + +namespace Content.Shared._CorvaxNext.Overlays; + +public abstract class SwitchableOverlaySystem : EntitySystem + where TComp : SwitchableOverlayComponent + where TEvent : InstantActionEvent +{ + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly INetManager _net = default!; + + public override void Initialize() + { + SubscribeLocalEvent (OnToggle); + SubscribeLocalEvent (OnInit); + SubscribeLocalEvent (OnRemove); + } + + private void OnRemove(EntityUid uid, TComp component, ComponentRemove args) + { + _actions.RemoveAction(uid, component.ToggleActionEntity); + UpdateVision(uid, false); + } + + private void OnInit(EntityUid uid, TComp component, ComponentInit args) + { + _actions.AddAction(uid, ref component.ToggleActionEntity, component.ToggleAction); + UpdateVision(uid, component.IsActive); + } + + protected virtual void UpdateVision(EntityUid uid, bool active) { } + + private void OnToggle(EntityUid uid, TComp component, TEvent args) + { + if (!_timing.IsFirstTimePredicted) + return; + + component.IsActive = !component.IsActive; + + if (_net.IsClient) + _audio.PlayEntity(component.IsActive ? component.ActivateSound : component.DeactivateSound, Filter.Local(), uid, false); + + args.Handled = true; + UpdateVision(uid, component.IsActive); + } +} diff --git a/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs b/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs new file mode 100644 index 00000000000..924fa8ef63f --- /dev/null +++ b/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs @@ -0,0 +1,7 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._CorvaxNext.Overlays; + +[RegisterComponent, NetworkedComponent] +public sealed partial class ThermalInvisibilityComponent : SwitchableOverlayComponent; + diff --git a/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs b/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs new file mode 100644 index 00000000000..65eb94d9221 --- /dev/null +++ b/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.Actions; +using Robust.Shared.GameStates; + +namespace Content.Shared._CorvaxNext.Overlays; + +[RegisterComponent, NetworkedComponent] +public sealed partial class ThermalVisionComponent : SwitchableOverlayComponent +{ + public override string? ToggleAction { get; set; } = "ToggleThermalVision"; + + public override Color Color { get; set; } = Color.FromHex("#C26E4A"); +} + +public sealed partial class ToggleThermalVisionEvent : InstantActionEvent; diff --git a/Resources/Audio/_CorvaxNext/Items/Goggles/activate.ogg b/Resources/Audio/_CorvaxNext/Items/Goggles/activate.ogg new file mode 100644 index 0000000000000000000000000000000000000000..96cdb288fe07d0e1d3c0f38774cb7ffe01624724 GIT binary patch literal 12048 zcmaiacOaGD|M I2md*~??z`_fWN~xmtbtLKp#Ix zcmE3nOs)Ll3jnMv?9caWn8AhQzsH5-1tnF?mWblq==^^jcX9seA%n=e4uLLGvcfXb z!eXMLgb;!hIz1h{T`>->Xhn>-Gb7Y@bMSWdMElu!J9wcLjeQ`j=3fjQL<~fGJNx+A zxjQRbiQ4?z*dYqq+sVfn?WYLYaDr@zNl0E8VfS=*{A-^Q;_-600SP<$LHZQ+B$e5z zE^zMN5H1ky=kM<0ttcfX&IBQye7t-e0^A)v(SN!972W-Pyr5G&45F&38>=F<3{A8Q z^c7J7?w;-e!Gi3rXa_%bFP}iP7uq|(Uy$9{OxZ+`J;1>!z}?BgQ;;2f6XWiCK@((m z@$p1M68^quCwB)=sO#s1h9rD_Jl&npkR~5jSI-MXfE(J+>q6Gs-PJ9CJ<$DPh%mgr z^SP{|Y6=4g0J!`a1T+f$>7po^R16tcSX72Qwi#7)sUld!b* T>3k5N@44ibCaeR%E#x#LOk7X&8wwx6TsPDaaQe(JlI#E(%wQFEQe?Xy3<35|!Aj zNG+*jrYKkCAiBRcxRf U;)5|%t)#lD_l=g z`(T2atoNGzU(G55&G<(g@*(A@yGtp4tSAm6{-1S#hJmGu7wyLW*U4B0ZSrSC6>^K& zD|r^=S=!Zdtl64%!KqK;8|Bur{fGKjv&DuW=vlS}X%@t{mff9aLHrlutqvZ}61c$K z9NMtYrg{rOJQcwySxI#egjeC7oTXC@L7I)h$R|1%IR6V(e=eIn8!Xv07u}N9#*8P! zJrHE@c4Hx%@?Vxee1Dt_%@;u#ljJbRPdK{f#;!r-$Rxg@e6%h~#1xsWvN^KuR*)u7 z$en%@sm=S>;c$Q; ~XM zFwa0+{GaxB>d>yo4h8$)iSWN=@E?#{=Srje?=+zW1-`V`|HPYC4VTU+*Wjq2!GWX! zjiM2)`j{kY SdPUWmS)veT1Gp3S0bN&4%F56sZA_PvzuK zz09AwBAd*mg>dT=00{hxjErCAOJ0#p< PQIq<6SK2g?CxH z#JJS`1mBNJ{+;6pjUwbwvw**w#(x$7+OPXx(!L*I(WB-bM+%{gg~pNU (ua`gS<15IU)R$W=m>l4X$X=rqbIR;Rim8&m%}|a?!-JfL z3yh$=66+J|X7L-++T>Cnk`rJpd@Fao^!Z04?dl@StJ;P2CLSx L$pQ5F+nvlG#F6JebtWli4iDl1>ql%LiJpEiBnO4AzCy%^BAnh{FR ztj^0A<7GvoK6wc>o}q4xfwY9#VbIf)Y9knRR66>?WIEdB7TT-<67fO>hAjrz*gV46 zn7ddVMUP=HHtFa^GqlAK+NO5`vv{OCR `B%3 @ESNO-xwQp2Is&vFA43P;CK}TB*QsrI!WkT6a zsDRpukNYj1Q)NXRlPdpT x! ;*`%RhB5E_!@g!D)ItC5*HSvB0cickjNVqP~O8Y@}60en~nfV zTW*j-4D5Yb-hWdtl0;1h3icnUjYvY7#rg*WWuMpkzZeW={tpidV`FoqW+Vj#Fcjd5 zkQ9WmI1C#z`GcvCwv$AeL6{8mqPfilPd&zp!F2or<7FiiV>OAHKZ c`QBa#xjl@?MWwV}O{!51n^MDs~$nQEv( zEEKDR51?CQQrg9R@&YPMqyD!x`=2W9|3G-)*gzH>Uz^I~ua-sRb6kO8A*CG*g_(Y& z@ ZJQqYHO9&O*xilM;aovD|(ompqQGlEU%u(x(dZD zokzLc6pOaI&|7o=q1K}mq=(pqrT=d0qY1}yskOOC%Fb7`PL+*^OQE~`^_CukipT6x zhSlSi{(Be2WP;eyT;v{9U|J{2t+7Szy&-S_;8r9KP>V>CDCf$#l#EY*F}OV5OXc%AQUSpRng{;5mSA~Uc_%q%n{AuAI|~L z?=jWsfo|-SxPTCHfhfXI6bF!!Qz{WC^CEm-LDj8_bBv~>AnrYabU-C`32^c7eTE~V zd(>xo@B$c@B7}G3DOD&VD7%*dv1Z2`A{mAK7~Z)h+?;1ff vZ?K)`<^Y^Y8mQtIJACUgo80M=7E8Uw`0GxTeKU2(s@j z2H?k$Uq3&;BY8!FM~So2NQ_6|I(`&Flf!z*C*)(EM_v%15V31mH(Tz?@iU+OV6t%C zCEx{3SiGREhygqbF)bCq_ (VX@(eW^A?Cb!IdH6sUm% zr@4mRT(U;>VnMLP%~ND!Dz)jL 2kfYCXYx8R9bAbj)4Wp z!0IV7T|wQ+A!R!EbVc{Co`){Ya2Ukf?w*GZ+rFy7`epIJ5>?EX%>uu}n5H#B9&Fgh zqC)p8n?6cS`+Xl{PZEv@seyef_w&XOpRa*t9 Ai zWWAi^yg}z)YvHVG(HNGd)Thr~xL6k1K?K%q!Vjm8s1g@h71z0C-(<}G zhWX58d6%P*Z->rHvXy{wDfX~xFfpb6UNkPCcKSFIxFZ``QD*&!T%>Ye%41(H*@#X^ zu>7|E3=Ene6)S0oPoq7VePR?GZ1bNRy)U2LXx_3?O+=2>IqLb}IrJCRx ;R^ZxlU`^@E$A+s+>Avu536$qsH46Msp$soS;2KRK~{yKS+G@0(WGKwfo7|A1(g zrqwV>ACpOf!)No}aG{R|d)7(@q4j4+jtgf$P8Ls|(76a~8J^UIk+Za4dQ`}L3D(>f zROiTh-ezgy^;k7C+NLz9VnRkEd~*40e1#8@(@M)Nz9wHt$*ef@?O0D;bW%0_*<}r{ zDD{=MPw?`&Z3`nb9k0f%n(=Vld=XK5FjKi_E#^(~n9+*G%Yt6Ub-nUwcD#Tf)6l(4 zI(^69fn$SiRbRgSin#~t)D6h{lP)+IGJ=oq7ruYBlGbAdpv`4Y^w|Rvgy`KbTLt~3 zFM6{HFy>fMr~82@vcwMZyE~KjLT;3_Rvu{ }PX|4o!aZ9e(-r zD{%?wEn^WcAIUT_1P~eLI}jC1e5`T2-@xh9@Z?Z7#)G`%)2rOpdD%o$cXMT~8!uWF zl_$Eme~)nA&ghbe5@`+Kd9#2jh`(c*L}S96C)=GtuXitu_`%#JMH_C)<554`x*wR2 z$Itl$7+Z1^;;k1Sh{Vvkr_NYAE`K}sRuT^6nL8#l*YeiOPFhdi^>JE0{+XLO-uu4D zTMIX@SZk$cN)OIaFR{?X^Q+ay>Kj+3##zAH&MSlE Jt3 zJ~!Qz7 v|HUDnnF0?l((5aaQ_SUb<;UwQXEi=Q2)RE^4yDR5bjq z>1F1;l8uKxKj{2kxL!iiKYbEQP7pUi@4T>!Qakp!*5jnrqHn&_EN{YXyA#dfDiIZ`}D3!H?&NAJv~}|#7^ W240-P1d7-*4c4o`@mR z-N>PC4j{P94=O%mXg;({^5*QlJ{{X{|2nj28$5LOEaAv!_twce?#CfvYFD1HEtH33 z3ola#v*n$T=aNSr)Xz4rSF3_C71MXMYb>YfxO0ZJn$GQw3b;(dhQPk9+rK`0LGxi} z!+|hofEwx1;hF~ihb{a$!#;VbTcJ|sc{GbxIy*?g%jE3jQXw;Dv!Ls1))B2y8@h2) zs*)1kJ0Wbn@b88tv?fOy_pxtMaY#T)jdNVTUZ>}LJ5^I(o%HV?0ZxADU)oA-)eTpE zytc5M(>L!tc=kkg+Pj_@9Pj$&UdjkAH{O=$efo1@ef7iZagyg66v-`eBKxjpuZg-x zrw4;X*SNJLhYfkjS^-# O>>1b;&ZRl(D7^J9x~_N6q?K)8c!$C{WV0%Lm t7}L2!QDJ!;CAPl+KM-iP4Kk$HO`Z+ z7+Gtf)jhV4`3J|XSHg1rYH;S{iT 7KIZT0A8wS= zzSjI>rfpN^NBr*q+2ZRCjclsgb)=5xKP0!`xRjT#_Bt$*x%%r6jJ$qzZ@27|&7RAt z@Ndj=KjA0ij-C!$o%BlU;-iOVz9j(#^74WX*eo(V8p%O^oo^#iE|x(9E_UTTGXAi@ z{)droEv+1sij$^ExOg)&8x#92ZLZO~jwo~Q=FZ-^;!m~y^n0dsicF~Uj< >TM_|#eIntDLV970DVsy_`Sn!?1`Phq-W5rv@Mq|2e6-}|4 zPak`gpIN}L-+wl=^U ++u% zgUfd9Kk9W|>thzdo3bv1wWv+AY${ 04V74y}->7__Oa}VV2Cb`s7Wuj-r5j_RFiRNNBHj2#`Q=r>K85o5`ZLow zO+GjIsFdG015FbI?C=AaC(ywbf6v|8G?BQysF2)yf1QH*<9*}x^LWng=L>G1hYVb~ zKzExuf6PXF4rY|2AMX1}rstvGx2?jX=cP}Hmd`j$yS^G-T=n!aPQuyK+MmV ziNrI@5eLnVG#p?1WdzC%+YP+eP1%)hi?;`HkJimN6pGLb_j~+66^IEE8)$`VxTzSs z+N4fzgp1v^7?gV}OH9Nj4)1tzN_AVH$8lf0U=kUT)jI4mk>6S?+F~(rXv;fW*tk2m zxFH$b-w?E|gVHSHSPB;U+47*>!gG3A<{wpjZ|1F4ghYQS0qK%9D(Br8{EUZ-v1r8# zNX#oW(M@eP=}-4t5XccSGsDNmewL2)-o3Lw=rXW+$9mTIaP18}aY2mTCiU#A+SreB zB^8P{(WliaZFfcYsAdiO(v7aoX+A!5W(a;5F6p6iE^AlODJ>Hi^Q25tbf05;qd`ba z3t{_tx+v{L)$`?P@A-t9knCs%eCF*r4Q$j+wLYcz;|VytW|?%baY7AxJi>O0v^owl z2h0`k?%tnetvu&WxlA}Cd&bS;t=!a$FPV4ZlCm7&Rbhv0wZA*(#50*+0#;oWghaf0 z8Slg#eI7~*%(0m)*q!j5HL`iP{d7f>;pt1n-Mgjgy03JTD8*+5a4K&Hl8H@LE1q}U zv%NRI|Bl>aXoU+UAG2J1E4+Itg@2Y)p#MO1`B#6Aw&|cchi;ikg(Du@&rh$*t&1|g z5?!({t0_w#57E22c}!DN>^bT3EgF}Zv_@<&-v0L}v2>Cz?zvql=%U}=i!~{WwsuCw z7|6GAv%E{ivS5iqs^FjauC8*HUMJ1~m=Eh##=x3Hyp4>d{^xdEmW!mWjH{L>&u)!e zz5pDLzLP9%)K_xciu_)`VHsN$i`n9>XRl-*&!>Nsip3h+*!P+A$*rB6sHPQF-{@E# zQl3<;^uEm^^YYTcLZRMS4j(=Z+w@sjMV0S+c5P{ F>{!vp7_ zmy-;<{xgFW&ueXQ5Fe%<@`CSNh;}?c;EXMk>ps#wq_TURKIR|1>#BRDDOLdWWj{a* z2YLn_L)H$;GrpZ__A%^9GGbd=#P5YU(tXn<@zq;VyBS( O*#3UVEJWcIPZ;fPOEvbCE}&n(gYlqzd=!!Y=bLc?#FTg4
lBkKl`w9vtkoZm?*^Nr0GNqfNhHKO+tXvbC2N?G@oxNogy$I{RZn7 zY(KgDQee~t<$wz-?KK1dLELjZaF-&{U2Ftpd(}~3<`?Ci;+P=yx39;qZmL`K+MOuu zO~7cW@Br?hfY?ZTjvXg9C|@SDtlGCQo^3bjgS~kG*8)}J$rsPw-x*!*Z!xEp-xVHl zkNL+nuW6Eny{9qSjTv#CYL2+J)p%m5-@Oewb5IW)iR_seICMO)$s4yRD59LV;Z1yv zc`CcF^$i+Q4G=0{j97tvc87a#@i-Zvlm0*kYcu^!)MpY*)~E7CiLG+G-0Xu#?;s&b zc?x$qd39eN455NgdsS+|#v*)vxj*!0a2WlhR5lK{7t_mtJ|5ht*pF}&yLB!s`v}e? z_N0HMdLyUD(;}25wf$P9ew188v7{zzRg28ll3M%LXw#|C#>NBl1s0j3<|||B@jqN> zvaRZf(9s-&IHN}`vEzCly*I5BY-u|>0}9$tG$OZmbu7jG2{WHta==z;JgEJ?g%ZCW zckA#ck_Ya`(<0%};C0P{$(;F3HhoKUp0turu!T4%=U6wJ7dqDvyyDMY*jdpjNw%zw z3RLrvx0zfyU2qK4BcpkU5jk!3GE!IS`KLI^*h9^hG+hP0u6r&uH{r>_G1b?fvEc z@RXYpTXQGh{AHicC(`4%$2>V+63di*)d%Oc@@$NU6I?P_i~i8##5tzt0iOA>E&>j{ zK1eg=ZoktPoTV^{f&;6SFiwRlR>_T}_X4{eh)h>sv6TsvEa4`zq2V1#Vr)DnVCDhh zZfa0zfTvkBIVPZ1F&VFKVXQJzS(`F%tef@K^fuaQWR>JYRBNx_YE|7kFK=$+&oRUg z?hH`ex$!H1!eH og za-tP)vBR+3^XGLTD%+$y2Dj^J*fd_{J9lCzyU_7x!Ck>9(VfTr^GBD>-0$IwYDAGR z-q$fmR^4tNJe$0~xpO_Ds>#4K6u&f)H78al<>sZd&zW=gSKC(v?a8hz{~XY 6^4kfJe z%OA|(QBLVO-PPgZ)Scw*R40Ls&WK&ZB~wE4;p{Uz%LepSr(&2fUpb!Q2mbIN%(sC{ zE>XSaVVzC>di@YDJmfG!|9^T8+}vq-hHCsU8&%q<&-cza#@AF zgaPpmCvgn>1MnLyrxxZV#8OH`ZDC4fC}WjF$4TuO_kQ{3{o}6<+exk8n;To(bDG_y zO-|#!zDP7tHF rnqq!$vUcoK7mOXz9`*Ge z!_>a0kuqqYfSm -J1T{nYX=nU$G*wiq7AS_|+uLw+9n{F YTL+^F93Il_wck{AXGe{tXiCg2h)u1&b9zkA=g>{wMzYM(e$ z O8+` zSShhN+Lz9{s%_g`lDB&E+lfdr9v}!nmeg0KN8V3< PD46p_7K>&cRrh2P!#R(`i;h= zjJTVvaM;j%FzXYhONt}yh%AFSO~Jtu#mK2`a_zCJ|1}P*g~yLamA=k)_n=?QGe2`V zw>E=CR)o_X!N<3{3%1tqrWV 6vQtU4nY96^6aN&fTIy?1wG(4Zw>@<)GeDjI0 z^4r&`;LlPC@F_Wv tPelgH7Q8OGlG zpyz&({LlHPZ vr?A zLF_Jt?u0o7J_u^Lr1?x?{vUrqBNzzj?Rc8|$oJLA7PGi7AC86o+=RHJ!-hzwqMUuv z;>M4g75E4O-}qqr&Kk>)<#<@1FQ=1(bW`o)7E<^?0818v39gg|N*Y|z0{LkO`Oudn zW>GaCKMi9To^RRTFDT^7bKQT4n~YmtkXN(>d`nN)7O&LZ`+o3`aPh0wi6feh$m~@; zGfU}EvJ-dVZJgosbS6vLHDN}Aj-114BG)tZ%-pS#yK|3j=8p!{v4XI$G~0@elb=(q zB>GyV)Vu(!|KM$-UgubP-fL3-sL`C-G%Q4y$b8*0oB*&-onNyBC3SioDs V;5X?iy6PlC8^%=UE;??^P_l(}krx(nQX)3j7~5@-R(oY2}$@{UcNa2ePsz z4k}qsp1-$z29~RxtI*yQon9P|ozHF!kHL9wMZWoTxM-9Yb3>j@fW@{-Niqb_F|Dz; zu6>_?S6fa1^mWwCG=2#UTdDjVn_1t^_n|;Z@dYDnAp=L5I5_u#>U##?iMmp)?OIRG zO3vOk;T?-L{g(D0uR!d>X6!Kv#<9W<*WCq;ucO-&vI9O4L)+h()GNAfnPW`oZ&8f6 zDd~$WHu)b9q}O)Jza)c%5Nr_*pl;zX)dDV_6C;$cytZ^Z(+2eJ&y)6{P&Y}Yz|Ewx z`L+s>M=mg~kd(S5I%3xIT&62GMfJrk>wnIba)?SMuX*CGkt0~eNQB;2MLbEm1=`Dd zZ?NXqj$Z}`8jpsY6@cQwcYpV@?xXOZLGr`uQb2)85cZnM1P&)fu-Q;#qHty1t_27e zc_fY?)R#>!t;+Tmv!0*cP&C4B9jp=TkP#tLd4E!{o=I^jhyWuq`vP5 _+ zQ!Wlj#KX!X?&D;e&x55trWg< 3$(wu#k`KdhLB{sFs@_W=__j4g74r_{^8Rt|$~v3KdupGz z9*zrCbVR{|9$hO|#r`G`enkpMO3%~-m x`f0{f(T>MIo@8_3_Mp{`-Va!&|*%=1Xl7fCSvA zrMHx}0${vIHh5A1dnIvB3zu-~EY&eA#}l~CoN2*hLq=3%`Cmso&p1E0X@wIiXwrSX z(^Qx5&h3X&g0(aI!GxjhvqNY5J` O@ak5lj=)ZCxcqrGC~^33FTJ)igM=l8*DslyZG)cfQ9!E%BmB z;&IO`ZAb6*FcM03SmJ$!+XZTG-b}{bbNc1L$L{`l7>8{4>_>&V$vkG&n23w(1s7p9 znUc$#PYOMbW-8hYr{RTH7;PisdtVZ3Hh4*vO4!jd_$WSj_icI}Fl0}r1NKr=hkJ#s zbUA9S5-%j^pX}bsS(u)Y3Nn5-re4pievTj-8Iq}>I5r(j8`pIzAz?@q_-y@A?oqQ( z1^10Zfu)+0+?!W(LL%_?=;FT=E_0N;x#@>T0W3qWSk4G_j~-Mr2mGcZfBCuLB`1A) zV5qssE&rpaiPEP{i_er?6nxUmMBs_8Jt|xNI6yVITrb7Cj*w>k6_l#ngJZZ0OhKdD zd;HOG>#CVsz2paL^F_S|Yn&o +|9v5PM^oQ z)IN(mwP^vRAs?MXdz7_k99=aNxY!TEFg<0Hmxu7H*v8u`2*i~M9Pgi{;UL;>{BG#? zd;Cs5-U3kLZ0 TdY{AO>NwhPlw4SzKA i>)je_f-w6{?B{s9moxlPtg!Yz0+}U|8XJa}LRuv#9Sld1JQWubiGl*Y|o5YUY~L zli;(%?5e|Mb`ShuC%cMWJG(}DUy0t~_J#5a;tX?0c^dtsS8{2w;r8jj{EJ7uU}Wu9 zm7(utzQ@qtRf0aPo$2t`p5C5Zo1GO3EZ&-tCAA23#kCo(bFAFJrEs{GsRLTtaHA$H zS&`!MG>DS)0yxXu2WEh^#s=YMK4n6iG*-V0OTtfint+A=syG^UI5;LkDe?q(o;YUJ z02IReN9%^Sk6})cDJK@r>Tfkc_R_*~0!Jz1*KWC86W{@&nuHMm=Pv0R_Ng;0ddc$u zXDKsfF~7WC)&0s|9rN(rG9ur%_MihUxN&+N{IXv<@m*jAg5^Yg+Z4RPqTv4lx3FYL literal 0 HcmV?d00001 diff --git a/Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml b/Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml new file mode 100644 index 00000000000..7b1121f5423 --- /dev/null +++ b/Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml @@ -0,0 +1,9 @@ +- files: ["activate.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from TGstation" + source: "https://github.com/tgstation/tgstation" + +- files: ["deactivate.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from TGstation" + source: "https://github.com/tgstation/tgstation" \ No newline at end of file diff --git a/Resources/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg b/Resources/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e1e8f4fd82fcfa0b0c01c28b4ec93f53bbb2c2de GIT binary patch literal 12424 zcmaiabzD@<*Z5t!MM_#?X;d1P?pQ!%VQHkh6j-D|X{5VD>5@i35R~plq?DFMQW5xF ze7@i3ec!)+^O<}1%*mNEXJ*d5cQtHmv;Z{VKjphKuF@@-aPJ}(LJ#q9aW%JdyG20c zD{g-PAW#JI_xC+S<5u$Daw~aDX`0m}zH_5_^S{bV^ndgaf@C!_4{Je@hr&V+d3ktn zKm-AJIhr}!pv-KnBv8(lRAAfI%-Pb>%GJc#%*jeZ%LT+L|AV0bi5^zYmM*R)c9s%` zJjVZ429RRqY~f;Q zL7az`tDBvRvxFcoA2o=yaB+HO=5A;1X!Q@bn}nU4ixYV9`GHh<1uZ#*$`frBjmHv5 zcRNQrcQ0-R8!Izc1}7H}D<>;wcQ R)tLG@YXSXzN25T2b zD^SAinU#f|nIqVAwXgyup1C;MSy+LZTx@I{ZxQacR<2IBvd(rkw(blbcDG%GVE!{6 zCRsTh2p|mrP&Z0W#X>iVU}9?7CseDnvLg<=RI+M!U(xcZ84j|z#W5D-$%Y%UzZ{E0 z0=EKTGM;3?kuo@p!7LJb2|;WUAQTP*adx*jV%h)R6kxU>RR)JHc$G(lAZT6Wf;LzI zrbi6owitr%$iB}As(^vaP(kG zu;UR^*Wv+v06;9QN!I(Ewm+V>zlIhchfp6A3`_uwqCDlu0_B)B 5=5cnnT(XayP&2mlzM838#hait{r zQElXGqtpEVs)i|6RDZ=m9}-X4S(jpk^Pp2<{hbG}8-aHtdAb7s>*PR6IMEy2O4xGN zYMwq(2D}DFm!;g`m5>?P4BO0d8|mN3;vE5@H(B}w86e+gR#%=r-aimqjn`NP=PmB} z$Pd%3yFDPpTIm&+5#0bnn3Z-h8LBlPq}=R<$W*<>x!tPzd)w~*L7PQ-+bn5oPRShW z1|f}}A4^%p|FZn$`|D(Iywb#>(Pj%AI1`(;42pNnsri1$oNw{qQU_(pZjW!-79@${ zup~c6z}fzBI2s_0!x%z_Q2y`DJe)C<(sh8NIPVplv$W(*6yG3s-O%5g=x#+Fkr)AQ z7qJ{yWfwxrNpMEbVIQ`c5mc{Z;859sfO8ZkA@KhCj{)?(EEbhzoaU`&^Kg#hELS|v zl7HOEa62^spz)J-{4U-9)Fax_yDXX{V0|#jCpf94fJ9l%rl9nj{0zT@7@zwsg7pGr zrk7%+|9|Q~LkD*~1~AzF83;!YrP~l}3z|gy-(i9i3OplI`WtU5wNTXw= <)G=Z5T zfr%qwRU`(gB5m8p2}onzuE@w0_Lx M%|5g0I0S*NKcc_vpR0#o9K!Cts?* Itj}(;sH|Y!8Af)S_}FAE9#R1 z>ZG7!ac>vwn1S0+WonGfRz+$bdqLjpW7tN)>=65_tW9EGi?m(@uN*;7icD}4Cg?N_ zKoeY7ynVb~w5}s6+faoO7$;p}4@{}_?UW|GrpQ1HUf8JZu$l!n2iOY@RLkiKwH?Z8 zKp_AdyzukK;>aP=WB~Az0D;F5l4L%@u^ERLfNjv4N5YD;EJk4L*+~O1w(LX_jzX}> zv6+=LqOy^dIHAH0#zzMPykyx0EEND^HsIScTJ=N$but!pQUwh%<5^OL>12Un0YOb| zq&k`Uv^G+oLLHgHqRy|bPKMMXRX~y>wNliP4OXK9PIKDGMGE9}qm|*ApKc0jkzal8 zwh2;EVAHtKX)*O*RmfRw =?Cm6}Osd^>Xj)zqsjl1L zq=j-aBvqItM^2|GXrVwYekLfZxmo#flmar@>eghkmGKKJ-6l}P3F+at>~3tFiZa%- zHariRM4^n6t(JAI^v|t~duLF~=W3IU>a)|RNhE4{2DP5 ^bQ2(CL(Hvva?~ef(r(V+h!T z%`_)tJ^$6MKka<(C__-TW~jYNy!E+zs3f@Nv1kDRO^qErB(wqtSit}&gR|t+WWvdU zz^#BII1bT889W5zpmIaVa+HQ35U(kN;$W;SZja&Y`Grs5s` >>zLp1vfeaZjNp}7#mAa3>=%W zFafT{Qb;MsS(BV(4idf?I5u~uxv>{^C%_$93iS-tV2zY+F}KFq{u(cAKp-5F-4LKE zDugtkPruE?VHJ~b0-kB$e*C0U^&I_t?u34Xvv3*cL zV!_VRLt#->*+4DF@sIIo3X96NTjMM}3GnD!g}tbRuwjU`=`nu6wlGb&tUa=f%pG3FqA` z5WwNx$V!Uj-DD_0@NUosBltEMk`fTN5CX5TAOYc!pM*fzSAy#v?RMSM2(VCKgUgl$ zh{FR+pV1Ef6xS3$&UtY6AIpymfGdmcF9uwFPJ{noP^iVfJV=zW@wvRFAQ-@4fJ=Z< zAV&YpZ&Ld&rZL1s0I3UNQmmHsjBj}wQHGQ{)3+EWL*Y=vS=8crh#5?@$$6*c;PTUv zST6t^VqgP#Xf!%XA{^BC+<$uoCT`%|$|y4i5rao*Au$3D?v0esz_f%XpMZ?ImIMd~ zV-+VJJR+l$ZqLbEs4$7--`wnfvb6sLVFDK#BEW^zmpqOd5$SwJE=VA#w1cuR&6PkD zmqRcLhLxX`1bWIWiWjG_V9G!>*^L;kQrhsvydo>;2?Ac(O>F_j)Qmwz%}j 7=oYF zOdGfz-X@c;dCwPu4#5P|C zVWUD)n7zflM<4h%ex(6`tV>5LB3ovN*QS&ahqt6u7S0jMD>uMU#G!@97{cfl$%vNU zt)tov9_+*z01oH^9_c4M=l}r`u_U$(oAk4KFuRqt3{@83#t6es2JZ5b15j4>H8kmv zZiTPinC?{HUOn6wC6* ;tGo&g|aPt!^nPv!2bKB2G0H+0O-XezB^8< z7}|rS6xNHa3}(Y%=>s~jfeuDAd3k}b`23pA@$W|v5->^mPr<;z_zQt?2w-6RecZzU zvi>37KJMM(JrP-0I#6b21}GQj!$(k77G`GV2OOQ<9V`zXJYwbMnHib<+S@VO(bGTB zGsn)x!N$VM{@~I4`@va$-ie`4pZkVbpsdU++z%hIu|T0*4+fxI++3X{4Yf7Z!LpLY z(1TOESMor|N1y9}fdzltcUC{;$6p28-2JS4cyqM_$&$pu*I3q?6Tl?`w8b@kegA#z zgC76=-Y#hY8-$OJA|e_qOHv=`*}L>9CX`19SWPsdCf|HwxM-K2HDV!^PG*kSYecJ% z)W74C`VJEZ188SCHP^V@c$m*o$R>k#UmwjjOT;TdrbP7#$FDgooS~Qi!r@pU z$)22C;v&0N?t!d|%rKO%*@zPCfIj(Yd<8X08##apeA2aHT4{<3Dr?nVMt;4DIqrE; z=-x7pwf14=RsCi}3FA);X-J@Lj6hPK>u_|S2`T@|og&8 X48&dNdb`7 }3 zQw{|BT#OSgfBX}W_52ralmB4*8?R|bA1$UFu_IDpXZjQI@a%|(<=845fOM|P7u{_) z()-rg!h+FmCK;DFg?rJSFlyLPzY#@?H7y!_UeFZfm ci~@fv`P(edh#Ij{2-i} zBY^we$lmK0iBaxoV{Lz~Zl~#DTiuZ{Q NC}8F+AaLc||Y+g%vHF;6NH# zX?q;<@QG{2+QsL8Jg4<4&w1~q7-e{GYlhmjKt*L2SA=bKms!O(*{Vk}=h-QtR5SI) z;o^>4?{vg7_H88k8@AuJs07*}S(vGu3cH5ANJ#+qLjuoF-xF;B-i#B9PS2a{IOaE% zcDWL )co0ZwfSZ)q^s 79KK{KKf#v%a0(kzK zHb<7pu4D_Pjwxw#Q~USnd}R5Y4B1tjGk*S!v+R*=46_Oe(6Qu0l2Y(G>e)xcwOcmF z=$tX$dSrp^BG%shukPr7dQwQA)Mq=sv4Q}KxlT9yUPN1?UJ+h&zjwoWipZw#WU>qT zF3;HRsXyu!Ta*5f9)}%=tv(1I4J_Y2^vyXx9-%}Q*lm*(ZsxNu*Pm8Jn63`H8l6=s z$SZIy$ReDBf41)&1I9oHZ;)_ynT0mX=F ;#@>wXi1Xv}wJDhQg#m2LQd1 z>5rDp%KRkDm&40&dg7$KROg}-(krLm&Ii1N8MCw 3R!6IzyM4Ov$hDd=cI34)X==|%2ZJrMwAhjBo=iWgQBT9XXMzZp*@n#8p5npz zf{a}gTZbM=CC|$1KUO&SrSM1Z*x%ny(^f<&{w?{;Mp_BIZ65}1P_iB1wOf!t?_bb^ zF`aEUV;^go$s}2~t{nbrm}`=WU&qRRn36`4El-)>pv=Ty@`B(c8X1H8T&?oi4qALd z&`^dzoV0aF3xq+)9g9Rd5Cfp8#tp=xY@_lwQB+14E(m0-@oOa_!zZ@>^uA#Vu}~OM z{$9w|IXJF|oTjG7B`ZN=dS{Hyj^}W=yt#YPQ?CEQ{3(|RUcLBNz46mkw|FHLjGQf| zpP~V1N)ieAEwvnaqZV9`O@%7^`cHHYM6-;FRp0Vu$I`h*_BnCDD4c#lfTdN1tM}i| z=xPHbTGEHs;DN#WHp$h$I9U|}D@pN-B&@4V>lDdc8_{yu*C9X!V05^o@?zPu|M?Sa z{IC)hvqx
UevPhn3^Hfuziv5u|fs+ zhxGJZpLH?T0_8vOWDZZ!ZdQp9Q~IX1J+;u?>P(Dk0y>~GP4*`p!}2+vG}94p?NeF2 zmmX_@5ve@AIj^pSG3%Npi#2Bkrw0`7*hf3p#ty!;E~2|ftp~~ZvKEhqr4WWml79eE zR16;JuXYo_ifcO|qCY7Pd>n{I gnN6%*tu_*DDTKI^?y^+%NrNIJB{DN%O`PdMpx;l@*YH2v+jHCpdU zj_amejU4lJSf3FJMLtw|;Z7Us#_ZA9MnT=y@-CtuIuRN!zP3ah;ZC&qv3spGbx|aQ zq}wE^ZF9P5Gx3A<0DLICqNQs0J6*|3dN=X3rx`IBcW^A`@j@4Y{nA~b(%07rf_64q z1{Gq#ywW>ko5cdJaw<^8Q5cQrwGru9uaw4!fxy7xYe&&me~CVhn^b{BaWPgC&YNm! zY+LmKX6n?*8L6-w#X9Z-tLa4qU#}<*!=U5!`vLDiW6#zUrgL5oj|gzouI`2JAH2q< z7sL6<1r%sx98aF+MgP$DPd#T=fo*DW7>Rr5MN}EG5OADYAOAe+oVqLFc%S?3)x`&c zXtVyy&X kQzf)W^RV>*a)m$w&Y kF0bSpi!=~@OCdRU*GUmA)TVtFZ|s*wv*n6&>k_tV4+C?ZVv5uv9p zHfJ8@j*T@VtKX#3>{lsdiGUiQJXr2|3O!X?gP_~7L=#IL8L9peetD9`{qsu+>Y+m@ z_m37|Srj_3NU&ykR2|Kd*=#{_cGG=hn9KsJ&j6&y@n^5^V?WWlwpr3H6Vi~EQsd3? zxu{v9r%~g{y8q>*|Mvr8A$Ierjbr-|d(Ot3>~T`4DqGId&GqEO$$@6=hd&sHOUZue z>o6Bi >^{o3bu(g$kHQAutNgnX}Y zY0L|Bm>DD#3PQw3C`Wu6N9k{9&Mr;7KGAbJ;|r@py)20jzIas*=lAS=cbz}KEAR3- zFii4TLj;#O6lePzpN{R;!|K F&s>$_eZKy#Lawt;RF4f1^zb7N-kYGdAM9M`R z&9E6S!hcaC1bHgF2HXj!wY@*)5 @;l&z&^gkn&zc#7xVJNnl`W+q`yQ-6T(+v|~064kN}JVyt{Ebd^AhuIEbT;Mi)* zaJ zUvaa)Ykn-f{;q1?ug|G+^I)Z|;*8s77N~dwch&|2C9oGiC4qFT>>;}3 zi?w6|w2v>3I;-4TuEyj?qO@v6`DpON7rA F0lR_vWHq2ty*-U@Sl$G4z3**f0@HoXU(a-dia&K_IlSio&cl_>|E!AS`ONgN zKrpuPzK4AyHnHG@2SjJdBTp{RnJ~A=#k=pj7|m>j!R*TOR0tqGP#+R}MnB|t(aJ@} z7L)_NI_}uJymMYQ_xs&_qA7ow^Dw`xZc8Bf;PU5l$jhLQX&)s^by=nqZy-;V2;wj~ zf#)CCBjsAIgo1a6m%cuCOQVD4=>pI=s#h5u9<;zWq{2(VFgi6#wNlj0(eK$|S$k^x zg}NS(@>fq}AB6`zGx^h!B#$Y4@;N)LUjQ#b_jBcZz&-rLPZ(y6y}LoSkDVJ+q>R4e zJ_s~z?F;sjdDQ#+H%Ufg3QL+iPSYyPt8k< a2i0Oy-D!@~l`glTm^ga}$ z-E1l;Lv&jA%(znxe_Z-7g8_|n(92K&TDti__2)3NXN=C8%Z{|jKpJl%af+b+tSF7m zm&p%594eg~m|vE7_+I!+hP=)0*9i` nb=ozbsMHXq=g~KikhB9t z;bVCZPk^DX&yN{#27QvkKlh tVdu?62}62BW6fwh62dl6UOqbgh^fbt5jdo%p$ql)^n ztzq|?7{a+V=K-(d&K6V1LZ80Qm)hc7C22Wq^eHf9_ID_Ad_VFl6u@*|Zz^B;ct~Pu zUvS9_nNlqIu;#ATW=-J!1PI*QdHzgJ1-;?`W>5rOE{IQlS-RIF|J#XRZRjCQLYtp6 z_@ZFrt_S_s?bDt&<|C31-)o4V(PIH`ypaWPw5}n{?|2F#12xhVfT^75)dO#u?RURF z7L-0(ZAbSJxf-p#5fh_4f!D 0PBy@HPC z_l`~NgnSb3&7%Cpz*iZAJiKCJs`oqB `}w) >qPS(FxwMU)CtSlb|dkZl5Yy|~j)q52w$trgenCdXwudLQcuI$_4 zoE-ab>>$=X<7nnfCF-vNinhIzgPXGO6dll*VTu>ElVd6&O0;LAsE?8{#O+ME-YTZ| z(4YDp{!Da@GspZ^bYixm<|OFdEV0C7Mh^hz>6;THF}RdV*+Gq$(PDUq0p;<& m$zYw>7C)uGZuWwng^kV2x$aa)c8MExSb8g=7p50WY zvAPjZO~Bxpj3GTpq>sL{D>vzRZq)nJo&%-iv+YKu L ^2%n^w{SJp<;o(ARn~K2HKC}*+8B?LDXA2 znYh;FjBBA(LjEX%!!``Hm4%ky?}<9%qSqOJIH;zNUT;hV82X?G=Fiys1pPq&rmsfP z$R;U;7eG5#k>wMokF)h?d~&01V}}!RFj~NRw4E-Qm4ye;YSPMVtT;JA9O-l1vsejb z<`V(ai^*qOhP}%TM!KI@%HKtl#z5jv$tcg{@y{lmF@Y0peF`k2-AY60FzItitTg}t zpRtGUhW)Xq575=Q`F!zIHr68-7dN=~jnrk4h(ETdFfD)=&jfJEACG!lY))RiPkc+e zclKqMmJp{l>13Qo9}283P<#>G6Fwg7=QYR(WzE?ygZ}t!sfXq_URoUP6?OtQ*pC;z zOX_xFp!H)tQv0jJ)>Bt=pKny9sjC?j-+ny!w)+0vC!@6^75Jy5H(VkDOZceMlq~Z$ z(YyZQ$2aPQjpWjPzx;1ny;@zSrNoIo+8KP?eL{iv+rMC$>CT~xl8ybhA|LwF)SS -E9Afzpgn|UZ9bLV04AQ2TZV8@ZB zQp%!f^V^KAo8?Z4YtlT&k;{(bhU`X~tmlFTA!I}7yICva$qyA3-T^l9hA+^u&NEKC zUqff8%S@i~r;?AXGs{ (}t8sitH?SQDbJwBitf#G`+G5F<;|LblxJ_j;<&ph^uV@ z02k_TFnR{~e #?kR^x~E z(rlSilTx&|?+2ofhmF;knv%p11brGrxPsd0eJ&><5L}N=Pi aP#NxL1cZW44({S>KKl z9Z9{T6MO$lsoTOV)oh|VeZauvzW?Q3Q=}?FJi<(d--wrHU^|LWI2&7XaA8Ci&kRmg zf^lZVdatE8DN} tPNWHCv@~{LtoCC+c0;ah%kWe|MoJPS# zR@?|<6s}Ub;Gzl=!kDBO&(gMUi<=i*L{{EJ2o>yD<&!z Q`e(Bc*@LZ-OD)$V(wv8i12;+z`0Gs s$1;O;e<#M*W~GhP`p`tjOCE(sVCnY;g6@u#E=6(FKBn(&piV(DnP zUQU>Vm+Z03fkZGZRyF#R_#8K{^rlxJfdK%BL| *FN(sQk`n4j$ {m0jjwN )z)viC2tZ3pniI$acH6$TnRsxyqNUD^atnUItn5v6@i=3d`a~k-E7m%kHq`9C zCOXHSa}2T70slYOaV&h@)j@uYxoI;b$C7&IyI%(B(ct`*U4q~TafCg@50FIzrU4Zx zYmPs68|U0+3Pveje~|jjt~e;1txYwtE2_p=_oG|w6ZqfBcH%+Skk}le*RK#YJ+V<{ zbsb-a_T7R7*TfCb%yKJ7jNb!+IVl?AQNArkSAHVU_)k=JZW5yU=e#_WQ{s%DU(X3_ zQ#0WMJbN)I7OdCfd;2(-lkF3N`g_f?WFK=MEx#JZ?&*bei7FBCm2cFil0g~qfxgy| zx02V?1Sop(r2&?`&KqHCdk1yQlWvP;>)K|3#CnKHqZb|c{e5!NE2pac+WojfQfSRr zR*8+$Ot1K^FeWXJA`3V5q}$wRMXAzWOU89^?ilId^Xiow3QmHCgo(8kU(C%NLti}& z-oXP?hWmf&!{*}hdKeiX*8Qh-l|C|KJ6Urg7i-U*qT-B?pPcKc36l`A_uOdx9FW}N zKM$a}&$DS#qdhge{&rj@`D9!lYrGC!n3c1jpZ1k+thJx+^Gi+ZZgifG5)K|A)a8nV z5Ko|T`p#N23*{Et*FsjjnFd06c4Kgom5EoAuF4RE) (p`M+{}&Pv7M7z+p7_#*gFkBM2>Q}hld;e z0|FN3-_K_)8u4fMJ{ET3%CcMk$)^tuL)lL4PEb{ i5$uHI3xb$}qm7L+~ z4Y=4+Fq~1vFKukKvgbzV09L!z&?g*M2z=D_@{e6T%WlSkg-!oUtWP{qjD|Qt-=rrg zY_4<+%`HQHeYLJpp4Dyr;$;tz11=k?$o@#!UiG(%*p1KPPl?3t$+<`^?!3WFe16x( zv~xDAlI&34Az++R5J>516Ms;^s?j|6$nkFBCd!8NWq%ASx5q)OIU_y2Vc+Axx*gB0 z-ck;^g4bw738e5l1*3*s(FWweQ*>#ns$}jGPAp)_s{Yv>hz#|& C%SD(m?B 4X(sDAEo_4Cqh(#yq_1k+Ldj Sc8xHL9cIf9uP{WMV>uxF9(i!LL z S- Z{kT65Jzel|`M;>-Z+o;iR#cM${||7Ja3cT! literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/_corvaxnext/store/uplink-catalog.ftl b/Resources/Locale/en-US/_corvaxnext/store/uplink-catalog.ftl new file mode 100644 index 00000000000..3b1db5115ee --- /dev/null +++ b/Resources/Locale/en-US/_corvaxnext/store/uplink-catalog.ftl @@ -0,0 +1,5 @@ +uplink-night-vision-name = Night vision goggles +uplink-night-vision-desc = They allow you to see in the dark, all while looking like normal sunglasses! + +uplink-thermal-vision-name = Thermal vision goggles +uplink-thermal-vision-desc = They allow you to see living creatures regardless of obstacles, all while looking like normal sunglasses! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl b/Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl new file mode 100644 index 00000000000..6287842baf6 --- /dev/null +++ b/Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl @@ -0,0 +1,15 @@ +# Night Vision Goggles +ent-ClothingEyesNightVisionGoggles = прибор ночного видения + .desc = Теперь ты можешь видеть в темноте! +ent-ClothingEyesNightVisionGogglesSyndie = { ent-ClothingEyesNightVisionGoggles } + .desc = { ent-ClothingEyesNightVisionGoggles.desc } +ent-ClothingEyesNightVisionGogglesNukie = { ent-ClothingEyesNightVisionGoggles } + .desc = { ent-ClothingEyesNightVisionGoggles.desc } + +# Thermal Vision Goggles +ent-ClothingEyesThermalVisionGoggles = прибор термального видения + .desc = Теперь ты можешь видеть всех! +ent-ClothingEyesThermalVisionGogglesSyndie = { ent-ClothingEyesThermalVisionGoggles } + .desc = { ent-ClothingEyesThermalVisionGoggles.desc } +ent-ClothingEyesThermalVisionGogglesNukie = { ent-ClothingEyesThermalVisionGoggles } + .desc = { ent-ClothingEyesThermalVisionGoggles.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CorvaxNext/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/_CorvaxNext/prototypes/actions/types.ftl new file mode 100644 index 00000000000..ca88b9a6afa --- /dev/null +++ b/Resources/Locale/ru-RU/_CorvaxNext/prototypes/actions/types.ftl @@ -0,0 +1,5 @@ +ent-ToggleNightVision = Переключить ночное зрение + .desc = Переключает ночное зрение. + +ent-ToggleThermalVision = Переключить термальное зрение + .desc = Переключает термальное зрение. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CorvaxNext/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_CorvaxNext/store/uplink-catalog.ftl new file mode 100644 index 00000000000..c91985a04b6 --- /dev/null +++ b/Resources/Locale/ru-RU/_CorvaxNext/store/uplink-catalog.ftl @@ -0,0 +1,5 @@ +uplink-night-vision-name = Прибор ночного видения +uplink-night-vision-desc = Позволяет вам видеть в темноте, при этом выглядя как обычные солнцезащитные очки! + +uplink-thermal-vision-name = Прибор термального видения +uplink-thermal-vision-desc = Позволяет вам видеть живых существ независимо от преград, при этом выглядя как обычные солнцезащитные очки! \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index be32887c3f0..e8b942241d3 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -6,6 +6,7 @@ save: false abstract: true components: + - type: ThermalInvisibility #Corvax-Next-ThermalVision - type: Reactive groups: Acidic: [Touch] diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index c102b4714e3..de0959ebcb1 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -4,6 +4,7 @@ name: admin observer categories: [ HideSpawnMenu ] components: + - type: ThermalInvisibility #Corvax-Next-ThermalVision - type: ContentEye maxZoom: 8.916104, 8.916104 - type: Tag diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 55d881d1a95..97e8618ba2a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -354,9 +354,11 @@ - FauxTileAstroSnow - OreBagOfHolding - DeviceQuantumSpinInverter - - EnergyScalpel # _CorvaxNext: surgery Change - - EnergyCautery # _CorvaxNext: surgery Change - - AdvancedRetractor # _CorvaxNext: surgery Change + # Corvax-Next Start + - EnergyScalpel + - EnergyCautery + - AdvancedRetractor + # Corvax-Next End - type: EmagLatheRecipes emagDynamicRecipes: - BoxBeanbag diff --git a/Resources/Prototypes/_CorvaxNext/Actions/types.yml b/Resources/Prototypes/_CorvaxNext/Actions/types.yml new file mode 100644 index 00000000000..f8c817185c8 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Actions/types.yml @@ -0,0 +1,25 @@ +- type: entity + id: ToggleNightVision + name: Switch night vision + description: Switches night vision + components: + - type: InstantAction + itemIconStyle: BigAction + priority: -20 + icon: + sprite: _CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi + state: icon + event: !type:ToggleNightVisionEvent + +- type: entity + id: ToggleThermalVision + name: Switch Thermal vision + description: Switches Thermal vision + components: + - type: InstantAction + itemIconStyle: BigAction + priority: -20 + icon: + sprite: _CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi + state: icon + event: !type:ToggleThermalVisionEvent \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml b/Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml new file mode 100644 index 00000000000..49ca58473e5 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml @@ -0,0 +1,63 @@ +# Night Vision + +- type: listing + id: UplinkNightGoggles + name: uplink-night-vision-name + description: uplink-night-vision-desc + productEntity: ClothingEyesNightVisionGogglesSyndie + cost: + Telecrystal: 6 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkNightGogglesNukie + name: uplink-night-vision-name + description: uplink-night-vision-desc + productEntity: ClothingEyesNightVisionGogglesNukie + cost: + Telecrystal: 10 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +# Thermal Vision + +- type: listing + id: UplinkThermalGoggles + name: uplink-thermal-vision-name + description: uplink-thermal-vision-desc + productEntity: ClothingEyesThermalVisionGogglesSyndie + cost: + Telecrystal: 8 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkThermalGogglesNukie + name: uplink-thermal-vision-name + description: uplink-thermal-vision-desc + productEntity: ClothingEyesThermalVisionGogglesNukie + cost: + Telecrystal: 12 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Eyes/goggles.yml b/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Eyes/goggles.yml new file mode 100644 index 00000000000..318139adff5 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Clothing/Eyes/goggles.yml @@ -0,0 +1,71 @@ +# Night Vision Goggles + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesNightVisionGoggles + name: night vision goggles + description: Now you can see in the dark! + components: + - type: Sprite + sprite: _CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi + - type: Clothing + sprite: _CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi + - type: ClothingGrantComponent + component: + - type: NightVision + +- type: entity + parent: ClothingEyesNightVisionGoggles + id: ClothingEyesNightVisionGogglesSyndie + suffix: "Chameleon" + components: + - type: ChameleonClothing + slot: [eyes] + default: ClothingEyesGlassesSunglasses + - type: UserInterface + interfaces: + enum.ChameleonUiKey.Key: + type: ChameleonBoundUserInterface + +- type: entity + parent: [ClothingEyesNightVisionGogglesSyndie, ShowSecurityIcons] + id: ClothingEyesNightVisionGogglesNukie + suffix: "Chameleon, NukeOps" + components: + - type: ShowSyndicateIcons + +# Thermal Vision Goggles + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesThermalVisionGoggles + name: thermal vision goggles + description: Now you can see everyone! + components: + - type: Sprite + sprite: _CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi + - type: Clothing + sprite: _CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi + - type: ClothingGrantComponent + component: + - type: ThermalVision + +- type: entity + parent: ClothingEyesThermalVisionGoggles + id: ClothingEyesThermalVisionGogglesSyndie + suffix: "Chameleon" + components: + - type: ChameleonClothing + slot: [eyes] + default: ClothingEyesGlassesSunglasses + - type: UserInterface + interfaces: + enum.ChameleonUiKey.Key: + type: ChameleonBoundUserInterface + +- type: entity + parent: [ClothingEyesThermalVisionGogglesSyndie, ShowSecurityIcons] + id: ClothingEyesThermalVisionGogglesNukie + suffix: "Chameleon, NukeOps" + components: + - type: ShowSyndicateIcons \ No newline at end of file diff --git a/Resources/Prototypes/_CorvaxNext/Research/experimental.yml b/Resources/Prototypes/_CorvaxNext/Research/experimental.yml index 0d69e6428ee..e949c566f56 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/experimental.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/experimental.yml @@ -1,3 +1,5 @@ +# Tier 2 + - type: technology id: BluespaceMining name: research-technology-bluespace-mining diff --git a/Resources/Prototypes/_CorvaxNext/Shaders/shaders.yml b/Resources/Prototypes/_CorvaxNext/Shaders/shaders.yml new file mode 100644 index 00000000000..09733c85e20 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Shaders/shaders.yml @@ -0,0 +1,4 @@ +- type: shader + id: NightVision + kind: source + path: "/Textures/_CorvaxNext/Shaders/nightvision.swsl" \ No newline at end of file diff --git a/Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/equipped-EYES-off.png b/Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/equipped-EYES-off.png new file mode 100644 index 0000000000000000000000000000000000000000..b63f30fc713a739b08ea1070559e2d3b6abf3f6d GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R53 zr;B4q#hkaZ9K8-ZNVLvZ2+=sg&GN=-_pVLq1q&5k=x)-e5L(!M$7$j6723PGU#)W5 z#>Fc#EA)*#M@!aG&dIJ7@0$-8IDayh|E%7 wZ z^T!=~_Ut $ULtZq`>HPbLKH)0w_^@&grxzQ>o$a;58P>sLRUl^pFqX^AoC_sf|- zH%2Ayz4<4?T9&WSOzL5xS@Ej(Dhux2*`~2dY(w&WnfHDSyN;9=|6h33dcn>2wQv7Q z)v`MDu{6kVGFS>R6sa&g@nASHkpbcsG>L}w?5&9rY>pRx?sqz^_N1~;=k%T{AC(Rm zG2dQv;OyJEoDS0?dVgL{4!!Iyw=mT1fxtA;7qilMCvVtaXE^hK>f#Gp@*kwHG1Z^^ z*m`w?m zopr E058M1eE