ignore wrong repo

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,35 +1,11 @@
-<!-- If you are new to the Delta-V repository, please read the [Contributing Guidelines](https://github.com/DeltaV-Station/Delta-v/blob/master/CONTRIBUTING.md) -->
 
-## About the PR
-<!-- What did you change? -->
+## О чем PR
 
-## Why / Balance
-<!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. -->
+## Почему
 
-## Technical details
-<!-- Summary of code changes for easier review. -->
+## Технические детали
 
-## Media
-<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc).
-Small fixes/refactors are exempt. -->
+## Медиа
 
-## Requirements
-<!-- Confirm the following by placing an X in the brackets [X]: -->
-- [ ] I have tested all added content and changes.
-- [ ] I have added media to this PR or it does not require an ingame showcase.
-<!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
-
-## Breaking changes
-<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. -->
-
-**Changelog**
-<!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
-Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
-Changelogs must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
-<!--
-:cl:
-- add: Added fun!
-- remove: Removed fun!
-- tweak: Changed fun!
-- fix: Fixed fun!
--->
+- [ ] Я добавил скриншот/видео, показывающее изменения в игре **или** PR не нуждается в показе
+- [ ] Я проверил изменения на предмет багов

.github/workflows/build-map-renderer.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, staging, trying ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/build-test-debug.yml

@@ -2,7 +2,7 @@ name: Build & Test Debug
 
 on:
   push:
-    branches: [ master, staging, trying ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/check-crlf.yml

@@ -1,6 +1,8 @@
 name: CRLF Check
 
 on:
+  push:
+    branches: [ cursed ]
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
 

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 10 * * *'
+    - cron: '0 4 * * MON'
 
 jobs:
   build:

.github/workflows/test-packaging.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, staging, trying ]
+    branches: [ master, staging, trying, endrbranch2 ]
     paths:
       - '**.cs'
       - '**.csproj'

.github/workflows/validate-rgas.yml

@@ -1,7 +1,7 @@
 name: RGA schema validator
 on:
   push:
-    branches: [ master, staging, trying ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/validate-rsis.yml

@@ -2,7 +2,7 @@ name: RSI Validator
 
 on:
   push:
-    branches: [ staging, trying ]
+    branches: [ staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     paths:

.github/workflows/validate_mapfiles.yml

@@ -1,7 +1,7 @@
 name: Map file schema validator
 on:
   push:
-    branches: [ master, staging, trying ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.github/workflows/yaml-linter.yml

@@ -2,7 +2,7 @@ name: YAML Linter
 
 on:
   push:
-    branches: [ master, staging, trying ]
+    branches: [ master, staging, trying, endrbranch2 ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "omnisharp.analyzeOpenDocumentsOnly": true,
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "dotnet.preferCSharpExtension": true
+}

Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs

@@ -22,11 +22,11 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, ImmutableTypedHwid?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
-    private ImmutableTypedHwid? Hwid { get; set; }
+    private byte[]? Hwid { get; set; }
     private double TimeEntered { get; set; }
     private uint Multiplier { get; set; }
     private bool HasBanFlag { get; set; }
@@ -371,8 +371,9 @@ private void OnIpChanged()
     private void OnHwidChanged()
     {
         var hwidString = HwidLine.Text;
-        ImmutableTypedHwid? hwid = null;
-        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !ImmutableTypedHwid.TryParse(hwidString, out hwid))
+        var length = 3 * (hwidString.Length / 4) - hwidString.TakeLast(2).Count(c => c == '=');
+        Hwid = new byte[length];
+        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !Convert.TryFromBase64String(hwidString, Hwid, out _))
         {
             ErrorLevel |= ErrorLevelEnum.Hwid;
             HwidLine.ModulateSelfOverride = Color.Red;
@@ -389,7 +390,7 @@ private void OnHwidChanged()
             Hwid = null;
             return;
         }
-        Hwid = hwid;
+        Hwid = Convert.FromHexString(hwidString);
     }
 
     private void OnTypeChanged()

Content.Client/Camera/CameraRecoilSystem.cs

@@ -2,27 +2,65 @@
 using Content.Shared.Camera;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
+using Robust.Client.GameObjects;
+using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.CustomControls;
+using Content.Client.Drunk;
+
 
 namespace Content.Client.Camera;
 
 public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
 {
+    [Dependency] private readonly DrunkSystem _drunk = default!;
     [Dependency] private readonly IConfigurationManager _configManager = default!;
-
+    [Dependency] private readonly InputSystem _inputSystem = default!;
+    [Dependency] private readonly IUserInterfaceManager _ui = default!;
     private float _intensity;
-
+    public float tim;
     public override void Initialize()
     {
         base.Initialize();
         SubscribeNetworkEvent<CameraKickEvent>(OnCameraKick);
-
+        //_inputSystem.CmdStates.GetState(EngineKeyFunctions.UseSecondary);
         Subs.CVar(_configManager, CCVars.ScreenShakeIntensity, OnCvarChanged, true);
     }
 
     private void OnCvarChanged(float value)
     {
         _intensity = value;
     }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        //var query = EntityQueryEnumerator<CameraRecoilComponent>();
+
+        //while (query.MoveNext(out var uid, out var comp)){
+        //    if(_inputSystem.CmdStates.GetState(EngineKeyFunctions.CameraOffset) == BoundKeyState.Down){
+        //        //_ui.MousePositionScaled.Position
+        //        Vector2 mp = new Vector2(0,0);
+        //        if(_ui.MainViewport.Viewport!=null&&_ui.ActiveScreen!=null){
+        //            Vector2 scrSize = new Vector2(_ui.ActiveScreen.Width, _ui.ActiveScreen.Height);
+        //            //_popup.PopupEntity(""+_ui.MainViewport.Viewport.Size+" "+_ui.MousePositionScaled+_ui.ActiveScreen.Width+" "+_ui.ActiveScreen.Height,uid);
+        //            mp = (_ui.MousePositionScaled.Position - scrSize/2);
+        //            mp = new Vector2(mp.X>250?250:mp.X<-250?-250:mp.X,mp.Y>250?250:mp.Y<-250?-250:mp.Y)/100;
+        //            //mp = new Vector2( Vector2.Distance(new Vector2(mp.X,scrSize.Y/200),scrSize/200)>5*_ui.MainViewport.Viewport.Size.X?5*_ui.MainViewport.Viewport.Size.X:mp.X,Vector2.Distance(new Vector2(scrSize.X/200,mp.Y),scrSize/200)>5*_ui.MainViewport.Viewport.Size.Y?5*_ui.MainViewport.Viewport.Size.Y:mp.Y   );
+        //            //mp = new Vector2(MathF.Max(MathF.Min(mp.X,5),-5),MathF.Max(MathF.Min(mp.Y,5),-5));
+        //            //Vector2.
+        //        }//(_ui.MousePositionScaled.Position-_ui.MainViewport.ViewportResolution/2)/_ui.MainViewport.ViewportResolution;
+        //        comp.CurrentLookOffset = new Vector2(MathHelper.Lerp(comp.CurrentLookOffset.X, mp.X + MathF.Sin(tim)*MathF.Sqrt(MathF.Max(0,_drunk._overlay.CurrentBoozePower-50))/2000,0.01f),MathHelper.Lerp(comp.CurrentLookOffset.Y, -mp.Y + MathF.Cos(tim)*MathF.Sqrt(MathF.Max(0,_drunk._overlay.CurrentBoozePower-50))/2000,0.01f));
+        //    }else{
+        //        comp.CurrentLookOffset = new Vector2(MathHelper.Lerp(comp.CurrentLookOffset.X, MathF.Sin(tim)*MathF.Sqrt(MathF.Max(0,_drunk._overlay.CurrentBoozePower-50))/2000,0.05f),MathHelper.Lerp(comp.CurrentLookOffset.Y, MathF.Cos(tim)*MathF.Sqrt(MathF.Max(0,_drunk._overlay.CurrentBoozePower-50))/2000,0.05f));
+        //    }
+        //}
+        //tim+=frameTime/50*(MathF.Pow(MathF.Min(0,_drunk._overlay.CurrentBoozePower-50),1.1f)/100+1);
+        // 120  54   120-54 = 66    54 - 120   -66 abs 66
+
+        // 120 120   50    -10   60
+    }
 
     private void OnCameraKick(CameraKickEvent ev)
     {

Content.Client/Chat/Managers/ChatManager.cs

@@ -54,6 +54,10 @@ public void SendMessage(string text, ChatSelectChannel channel)
                 _consoleHost.ExecuteCommand($"asay \"{CommandParsing.Escape(str)}\"");
                 break;
 
+            case ChatSelectChannel.Mapping:
+                _consoleHost.ExecuteCommand($"masay \"{CommandParsing.Escape(str)}\"");
+                break;
+
             case ChatSelectChannel.Emotes:
                 _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
                 break;
@@ -88,7 +92,7 @@ public void SendMessage(string text, ChatSelectChannel channel)
         }
     }
 
-    //Nyano - Summary: fires off the update permissions script. 
+    //Nyano - Summary: fires off the update permissions script.
     public void UpdatePermissions()
     {
         PermissionsUpdated?.Invoke();

Content.Client/Clothing/ClientClothingSystem.cs

@@ -37,6 +37,9 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"ears", "EARS"},
         {"mask", "MASK"},
         {"outerClothing", "OUTERCLOTHING"},
+        {"underpants", "UNDERPANTS"},
+        {"undershirt", "UNDERSHIRT"},
+        {"socks", "SOCKS"},
         {Jumpsuit, "INNERCLOTHING"},
         {"neck", "NECK"},
         {"back", "BACKPACK"},
@@ -47,6 +50,8 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},
         {"suitstorage", "SUITSTORAGE"},
+        {"tailbag", "TAILBAG"}, // NES14-Changes, Tailbag
+        // {"pants", "PANTS"}, // NES14-Changes, Pants
     };
 
     [Dependency] private readonly IResourceCache _cache = default!;

Content.Client/Credits/CreditsWindow.xaml.cs

@@ -3,6 +3,7 @@
 using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
+using Content.Shared.Patron;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Credits;
 using Robust.Client.ResourceManagement;
@@ -27,18 +28,15 @@ public sealed partial class CreditsWindow : DefaultWindow
         [Dependency] private readonly IResourceManager _resourceManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-        private static readonly Dictionary<string, int> PatronTierPriority = new()
-        {
-            ["Central Commander"] = 1,
-            ["Captain"] = 2,
-            ["Assistant"] = 3
-        };
+        private PatronManager _patronManager = new PatronManager(); // Delta-V
 
         public CreditsWindow()
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
+            _patronManager.Load(_resourceManager); // Delta-V
+
             TabContainer.SetTabTitle(Ss14ContributorsTab, Loc.GetString("credits-window-ss14contributorslist-tab"));
             TabContainer.SetTabTitle(PatronsTab, Loc.GetString("credits-window-patrons-tab"));
             TabContainer.SetTabTitle(LicensesTab, Loc.GetString("credits-window-licenses-tab"));
@@ -65,7 +63,7 @@ private void PopulateLicenses(BoxContainer licensesContainer)
 
         private void PopulatePatrons(BoxContainer patronsContainer)
         {
-            var patrons = LoadPatrons();
+            var patrons = _patronManager.Patrons!;
 
             // Do not show "become a patron" button on Steam builds
             // since Patreon violates Valve's rules about alternative storefronts.
@@ -84,15 +82,15 @@ private void PopulatePatrons(BoxContainer patronsContainer)
             }
 
             var first = true;
-            foreach (var tier in patrons.GroupBy(p => p.Tier).OrderBy(p => PatronTierPriority[p.Key]))
+            foreach (var tier in patrons.GroupBy(p => p.Tier).OrderBy(p => p.Key.Priority))
             {
                 if (!first)
                 {
                     patronsContainer.AddChild(new Control {MinSize = new Vector2(0, 10)});
                 }
 
                 first = false;
-                patronsContainer.AddChild(new Label {StyleClasses = {StyleBase.StyleClassLabelHeading}, Text = $"{tier.Key}"});
+                patronsContainer.AddChild(new Label {StyleClasses = {StyleBase.StyleClassLabelHeading}, Text = $"{tier.Key.Name}"});
 
                 var msg = string.Join(", ", tier.OrderBy(p => p.Name).Select(p => p.Name));
 
@@ -103,16 +101,6 @@ private void PopulatePatrons(BoxContainer patronsContainer)
             }
         }
 
-        private IEnumerable<PatronEntry> LoadPatrons()
-        {
-            var yamlStream = _resourceManager.ContentFileReadYaml(new ("/Credits/Patrons.yml"));
-            var sequence = (YamlSequenceNode) yamlStream.Documents[0].RootNode;
-
-            return sequence
-                .Cast<YamlMappingNode>()
-                .Select(m => new PatronEntry(m["Name"].AsString(), m["Tier"].AsString()));
-        }
-
         private void PopulateContributors(BoxContainer ss14ContributorsContainer)
         {
             Button contributeButton;
@@ -169,16 +157,5 @@ void AddSection(string title, string path, bool markup = false)
                 contributeButton.Visible = false;
         }
 
-        private sealed class PatronEntry
-        {
-            public string Name { get; }
-            public string Tier { get; }
-
-            public PatronEntry(string name, string tier)
-            {
-                Name = name;
-                Tier = tier;
-            }
-        }
     }
 }

Content.Client/DeltaV/Weapons/Ranged/Overlays/TracerOverlay.cs

@@ -0,0 +1,23 @@
+using Content.Client.DeltaV.Weapons.Ranged.Systems;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+
+namespace Content.Client.DeltaV.Weapons.Ranged.Overlays;
+
+public sealed class TracerOverlay : Overlay
+{
+    private readonly TracerSystem _tracer;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    public TracerOverlay(TracerSystem tracer)
+    {
+        _tracer = tracer;
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        _tracer.Draw(args.WorldHandle, args.MapId);
+    }
+}