diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 503a9ac953..ae5763e280 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -82,6 +82,7 @@ public static void SetupContexts(IInputContextContainer contexts) human.AddFunction(ContentKeyFunctions.Arcade1); human.AddFunction(ContentKeyFunctions.Arcade2); human.AddFunction(ContentKeyFunctions.Arcade3); + human.AddFunction(ContentKeyFunctions.LookUp); // WD EDIT // actions should be common (for ghosts, mobs, etc) common.AddFunction(ContentKeyFunctions.OpenActionsMenu); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 1857e3f8e3..403161e0c6 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -98,6 +98,12 @@ private void HandleToggleWalk(BaseButton.ButtonToggledEventArgs args) _deferCommands.Add(_inputManager.SaveToUserData); } + private void HandleHoldLookUp(BaseButton.ButtonToggledEventArgs args) // WD EDIT + { + _cfg.SetCVar(WhiteCVars.HoldLookUp, args.Pressed); + _cfg.SaveToFile(); + } + private void HandleStaticStorageUI(BaseButton.ButtonToggledEventArgs args) { _cfg.SetCVar(CCVars.StaticStorageUI, args.Pressed); @@ -193,7 +199,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action + { + var input = val ? null : InputCmdHandler.FromDelegate(_ => _toggled = !_toggled); + _input.SetInputCommand(ContentKeyFunctions.LookUp, input); + _holdLookUp = val; + _toggled = false; + }, + true); + } + + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + if (_timing.ApplyingState || !_timing.IsFirstTimePredicted || !_input.MouseScreenPosition.IsValid) + return; + + var player = _player.LocalEntity; + + var telescope = GetRightTelescope(player); + + if (telescope == null) + { + _toggled = false; + return; + } + + if (!TryComp(player, out var eye)) + return; + + var offset = Vector2.Zero; + + if (_holdLookUp) + { + if (_inputSystem.CmdStates.GetState(ContentKeyFunctions.LookUp) != BoundKeyState.Down) + { + RaiseEvent(offset); + return; + } + } + else if (!_toggled) + { + RaiseEvent(offset); + return; + } + + var mousePos = _input.MouseScreenPosition; + + if (_uiManager.MouseGetControl(mousePos) as ScalingViewport is { } viewport) + _viewport = viewport; + + if (_viewport == null) + return; + + var centerPos = _eyeManager.WorldToScreen(eye.Eye.Position.Position + eye.Offset); + + var diff = mousePos.Position - centerPos; + var len = diff.Length(); + + var size = _viewport.PixelSize; + + var maxLength = Math.Min(size.X, size.Y) * 0.4f; + var minLength = maxLength * 0.2f; + + if (len > maxLength) + { + diff *= maxLength / len; + len = maxLength; + } + + var divisor = maxLength * telescope.Divisor; + + if (len > minLength) + { + diff -= diff * minLength / len; + offset = new Vector2(diff.X / divisor, -diff.Y / divisor); + offset = new Angle(-eye.Rotation.Theta).RotateVec(offset); + } + + RaiseEvent(offset); + } + + private void RaiseEvent(Vector2 offset) + { + RaisePredictiveEvent(new EyeOffsetChangedEvent + { + Offset = offset + }); + } +} diff --git a/Content.Server/_White/EmpFlashlight/EmpOnHitComponent.cs b/Content.Server/_White/EmpFlashlight/EmpOnHitComponent.cs new file mode 100644 index 0000000000..071de4ce80 --- /dev/null +++ b/Content.Server/_White/EmpFlashlight/EmpOnHitComponent.cs @@ -0,0 +1,24 @@ +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; +using Content.Server._White.EmpFlashlight; +using Content.Server.Emp; + +namespace Content.Server._White.EmpFlashlight; + +/// +/// Upon being triggered will EMP target. +/// +[RegisterComponent] +[Access(typeof(EmpOnHitSystem))] + +public sealed partial class EmpOnHitComponent: Component +{ + [DataField("range"), ViewVariables(VVAccess.ReadWrite)] + public float Range = 1.0f; + + [DataField("energyConsumption"), ViewVariables(VVAccess.ReadWrite)] + public float EnergyConsumption; + + [DataField("disableDuration"), ViewVariables(VVAccess.ReadWrite)] + public float DisableDuration = 60f; +} diff --git a/Content.Server/_White/EmpFlashlight/EmpOnHitSystem.cs b/Content.Server/_White/EmpFlashlight/EmpOnHitSystem.cs new file mode 100644 index 0000000000..9fd86c20be --- /dev/null +++ b/Content.Server/_White/EmpFlashlight/EmpOnHitSystem.cs @@ -0,0 +1,52 @@ +using Content.Shared.Weapons.Melee.Events; +using Content.Server.Emp; +using Content.Shared.Charges.Systems; +using Content.Shared.Charges.Components; + +namespace Content.Server._White.EmpFlashlight; + +public sealed class EmpOnHitSystem : EntitySystem +{ + + [Dependency] private readonly EmpSystem _emp = default!; + [Dependency] private readonly SharedChargesSystem _charges = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandleEmpHit); + } + + public bool TryEmpHit(EntityUid uid, EmpOnHitComponent comp, MeleeHitEvent args) + { + + if (!TryComp(uid, out LimitedChargesComponent? charges)) + return false; + + if (_charges.IsEmpty(uid, charges)) + return false; + + if (args.HitEntities.Count > 0) + { + _charges.UseCharge(uid,charges); + return true; + } + + return false; + } + + private void HandleEmpHit(EntityUid uid, EmpOnHitComponent comp, MeleeHitEvent args) + { + if (!TryEmpHit(uid, comp, args)) + return; + + foreach (var affected in args.HitEntities) + { + _emp.EmpPulse(_transform.GetMapCoordinates(affected), comp.Range, comp.EnergyConsumption, comp.DisableDuration); + } + + args.Handled = true; + } +} + diff --git a/Content.Server/_White/Telescope/TelescopeSystem.cs b/Content.Server/_White/Telescope/TelescopeSystem.cs new file mode 100644 index 0000000000..223654fd98 --- /dev/null +++ b/Content.Server/_White/Telescope/TelescopeSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared._White.Telescope; + +namespace Content.Server._White.Telescope; + +public sealed class TelescopeSystem : SharedTelescopeSystem; diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index dac780783c..f25646d24a 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -57,6 +57,7 @@ public static class ContentKeyFunctions public static readonly BoundKeyFunction ResetZoom = "ResetZoom"; public static readonly BoundKeyFunction OfferItem = "OfferItem"; public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding"; + public static readonly BoundKeyFunction LookUp = "LookUp"; // WD EDIT public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp"; public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown"; diff --git a/Content.Shared/_White/CVars.cs b/Content.Shared/_White/CVars.cs index 754f2dd42e..3748706b39 100644 --- a/Content.Shared/_White/CVars.cs +++ b/Content.Shared/_White/CVars.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Configuration; +using Robust.Shared.Configuration; namespace Content.Shared._White; @@ -10,5 +10,8 @@ public sealed class WhiteCVars public static readonly CVarDef AutoGetUp = CVarDef.Create("white.auto_get_up", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED); + public static readonly CVarDef HoldLookUp = + CVarDef.Create("white.hold_look_up", false, CVar.CLIENT | CVar.ARCHIVE); + #endregion } diff --git a/Content.Shared/_White/Telescope/SharedTelescopeSystem.cs b/Content.Shared/_White/Telescope/SharedTelescopeSystem.cs new file mode 100644 index 0000000000..78bcf757ea --- /dev/null +++ b/Content.Shared/_White/Telescope/SharedTelescopeSystem.cs @@ -0,0 +1,117 @@ +using System.Numerics; +using Content.Shared.Camera; +using Content.Shared.Hands; +using Content.Shared.Hands.Components; +using Content.Shared.Item; +using Robust.Shared.Serialization; + +namespace Content.Shared._White.Telescope; + +public abstract class SharedTelescopeSystem : EntitySystem +{ + [Dependency] private readonly SharedEyeSystem _eye = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeAllEvent(OnEyeOffsetChanged); + SubscribeLocalEvent(OnUnequip); + SubscribeLocalEvent(OnHandDeselected); + SubscribeLocalEvent(OnShutdown); + } + + private void OnShutdown(Entity ent, ref ComponentShutdown args) + { + if (!TryComp(ent.Comp.LastEntity, out EyeComponent? eye) || ent.Comp.LastEntity == ent && TerminatingOrDeleted(ent)) + return; + + SetOffset((ent.Comp.LastEntity.Value, eye), Vector2.Zero, ent); + } + + private void OnHandDeselected(Entity ent, ref HandDeselectedEvent args) + { + if (!TryComp(args.User, out EyeComponent? eye)) + return; + + SetOffset((args.User, eye), Vector2.Zero, ent); + } + + private void OnUnequip(Entity ent, ref GotUnequippedHandEvent args) + { + if (!TryComp(args.User, out EyeComponent? eye)) + return; + + if (!HasComp(ent.Owner)) + return; + + SetOffset((args.User, eye), Vector2.Zero, ent); + } + + public TelescopeComponent? GetRightTelescope(EntityUid? ent) + { + TelescopeComponent? telescope = null; + + if (TryComp(ent, out var hands) && + hands.ActiveHandEntity.HasValue && + TryComp(hands.ActiveHandEntity, out var handTelescope)) + { + telescope = handTelescope; + } + else if (TryComp(ent, out var entityTelescope)) + { + telescope = entityTelescope; + } + + return telescope; + } + + private void OnEyeOffsetChanged(EyeOffsetChangedEvent msg, EntitySessionEventArgs args) + { + if (args.SenderSession.AttachedEntity is not { } ent) + return; + + if (!TryComp(ent, out EyeComponent? eye)) + return; + + var telescope = GetRightTelescope(ent); + + if (telescope == null) + return; + + var offset = Vector2.Lerp(eye.Offset, msg.Offset, telescope.LerpAmount); + + SetOffset((ent, eye), offset, telescope); + } + + private void SetOffset(Entity ent, Vector2 offset, TelescopeComponent telescope) + { + telescope.LastEntity = ent; + + if (TryComp(ent, out CameraRecoilComponent? recoil)) + { + recoil.BaseOffset = offset; + _eye.SetOffset(ent, offset + recoil.CurrentKick, ent); + } + else + { + _eye.SetOffset(ent, offset, ent); + } + } + + public void SetParameters(Entity ent, float? divisor = null, float? lerpAmount = null) + { + var telescope = ent.Comp; + + telescope.Divisor = divisor ?? telescope.Divisor; + telescope.LerpAmount = lerpAmount ?? telescope.LerpAmount; + + Dirty(ent.Owner, telescope); + } +} + +[Serializable, NetSerializable] +public sealed class EyeOffsetChangedEvent : EntityEventArgs +{ + public Vector2 Offset; +} diff --git a/Content.Shared/_White/Telescope/TelescopeComponent.cs b/Content.Shared/_White/Telescope/TelescopeComponent.cs new file mode 100644 index 0000000000..599770e886 --- /dev/null +++ b/Content.Shared/_White/Telescope/TelescopeComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._White.Telescope; + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class TelescopeComponent : Component +{ + [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public float Divisor = 0.1f; + + [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public float LerpAmount = 0.1f; + + [ViewVariables] + public EntityUid? LastEntity; +} diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 714a75e9fc..89759da52f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -5391,3 +5391,25 @@ Entries: three-tone variants. id: 6269 time: '2024-08-18T05:52:22.0000000+00:00' +- author: 6Mirage6 + changes: + - type: Tweak + message: >- + Current sprites of steel, plasteel, glass (all types) and plastic. / + Добавляет спрайты листов стали, пластали, стекла (всех видов), пластика. + id: 6270 + time: '2024-08-21T10:53:44.0000000+00:00' +- author: Spatison + changes: + - type: Add + message: Added telescope system / Добавлена система прицеливания + - type: Tweak + message: Now you can aim from Hristov / Теперь можно прицеливаться из Христова + id: 6271 + time: '2024-08-23T01:45:30.0000000+00:00' +- author: Hell_Cat + changes: + - type: Add + message: Добавлен предмет аплинка - ЭМИ фонарик. + id: 6272 + time: '2024-08-23T02:53:41.0000000+00:00' diff --git a/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl b/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl index 8ef2b1639a..c2ebf31844 100644 --- a/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl +++ b/Resources/Locale/en-US/_white/escape-menu/options-menu.ftl @@ -1 +1,3 @@ -ui-options-function-auto-get-up = Automatically get up after falling \ No newline at end of file +ui-options-function-look-up = Look up/Take aim +ui-options-function-auto-get-up = Automatically get up after falling +ui-options-function-hold-look-up = Hold down the key to aim \ No newline at end of file diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl new file mode 100644 index 0000000000..7e0b0b791e --- /dev/null +++ b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl @@ -0,0 +1,2 @@ +uplink-emp-flashlight-name = Emp Flashlight +uplink-emp-flashlight-desc = A rechargeable device disguised as a flashlight designed to disrupt electronic systems. Useful for disrupting communications, security's energy weapons, and APCs when you're in a tight spot. diff --git a/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl b/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl index 8ac060bbaf..eebde7a272 100644 --- a/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl +++ b/Resources/Locale/ru-RU/_white/escape-menu/options-menu.ftl @@ -1 +1,3 @@ -ui-options-function-auto-get-up = Автоматически вставать при падении \ No newline at end of file +ui-options-function-look-up = Присмотреться/Прицелиться +ui-options-function-auto-get-up = Автоматически вставать при падении +ui-options-function-hold-look-up = Удерживать клавишу для прицеливания \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/tools/empflashlight.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/tools/empflashlight.ftl new file mode 100644 index 0000000000..e9ffe8e039 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/tools/empflashlight.ftl @@ -0,0 +1,2 @@ +ent-FlashlightEmp = Фонарик + .desc = Он озаряет путь к свободе. diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl new file mode 100644 index 0000000000..5bb4067557 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl @@ -0,0 +1,2 @@ +uplink-emp-flashlight-name = Электромагнитный фонарик +uplink-emp-flashlight-desc = Замаскированное под фонарик устройство. При ударе выпускает ЭМИ, поражающий электрические устройства. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index adb8e323f4..bd6dfdf10f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -71,6 +71,7 @@ - CartridgeAntiMateriel capacity: 5 proto: CartridgeAntiMateriel + - type: Telescope # WD EDIT - type: entity name: musket diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml new file mode 100644 index 0000000000..ed2e10a2ee --- /dev/null +++ b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml @@ -0,0 +1,9 @@ +- type: listing + id: UplinkEmpFlashlight + name: uplink-emp-flashlight-name + description: uplink-emp-flashlight-desc + productEntity: FlashlightEmp + cost: + Telecrystal: 3 + categories: + - UplinkUtility diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/EmpFlashlight.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/EmpFlashlight.yml new file mode 100644 index 0000000000..1da304ba1a --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Tools/EmpFlashlight.yml @@ -0,0 +1,26 @@ +- type: entity + parent: FlashlightLantern + id: FlashlightEmp + name: flashlight + description: It lights the way to freedom. + suffix: EMP + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-clot-component-spot-name-default + startingItem: PowerCellHigh + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 12 + angle: 60 + animation: WeaponArcThrust + - type: EmpOnHit + range: 0.1 + energyConsumption: 100000 + disableDuration: 100 + - type: LimitedCharges + - type: AutoRecharge + rechargeDuration: 60 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png index e19872eb4e..86e7160579 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png index f934c01194..39fab3165e 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png index 175208bb8d..9e4c57c472 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png index 508d44ee0a..42dd5b78c5 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png index bee5df405a..319212cb1b 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json index 0e5cf13ec2..6301d08301 100644 --- a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 clockwork glass sprited by MACMAN2003", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb clockwork glass sprited by MACMAN2003", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png index fb03eb65e2..1ef59322e9 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png index 4435e8cba2..4f807223fb 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png index a836a32cd0..46c54b7099 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png index 46756cff7a..0527d35073 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png index a876266fdf..a2e98302a9 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png index 4c4c76a770..84b720d48c 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png index ea661a816a..64db23652d 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png index 6f81392e50..58d874f750 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png index fb988da214..fe0847de48 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png index e3ad6ed7da..c5662a6bf1 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png index 8fcd8e2211..83f7d5e925 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png index dbf0e470f3..c18de604ea 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png index 17d66b196a..37ce0bd455 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png index 59fc92332c..a3f937dcdc 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png index 672d8be1d9..ebcf9408d0 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-left.png index 0e17405fba..3130c14f3e 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-right.png index 62314e54f4..43967efefa 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png index b90f150993..4fcd72b5c8 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png index 8b968ed55c..0775ecfcc8 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png index e5d194753c..dd8c9f55d1 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/ruglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-left.png index e81f496b33..e08e247a30 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-right.png index 6779cae094..91c5705ebf 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png index a1dc6bc6a8..a8e5aa4a9a 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png index 6a7d3c265a..06bd5ff121 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png index 9b90ae15d2..c5a2dc1572 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/uglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json index 920eb63731..b2988892bf 100644 --- a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-left.png index 8c2de1101f..09f8b3eb73 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-left.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-right.png index f44e6ef744..6bfc9e230f 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-right.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png index 4bdeb83bc2..e7d3efcfa0 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png index 8422a49bb9..83bfb1c35d 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png index d4cb88660d..705e5bc784 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png index 223a7a9ef4..2933c269bd 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png index f4c4259ec4..ae32ff2a29 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png index 06d6533117..b98e55106e 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json index 6cd21aae79..8645bb4f7c 100644 --- a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png index d4b3de2930..9e7b52fdf7 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png index f853b02f07..1512881de4 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png index 841d843768..ab2e41e38b 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png differ diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 2cca749317..7f4000edff 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -543,3 +543,7 @@ binds: - function: Hotbar9 type: State key: Num9 + #WD EDIT +- function: LookUp + type: State + key: Space