Merge branch 'master' into Revert-New-Shotgun-Sprites

Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs

@@ -0,0 +1,35 @@
+using Robust.Client.UserInterface;
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.CartridgeLoader;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class CrimeAssistUi : UIFragment
+{
+    private CrimeAssistUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+    {
+        _fragment = new CrimeAssistUiFragment();
+
+        _fragment.OnSync += _ => SendSyncMessage(userInterface);
+    }
+
+    private void SendSyncMessage(BoundUserInterface userInterface)
+    {
+        var syncMessage = new CrimeAssistSyncMessageEvent();
+        var message = new CartridgeUiMessage(syncMessage);
+        userInterface.SendMessage(message);
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+    }
+}

Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml

@@ -0,0 +1,16 @@
+<cartridges:CrimeAssistUiFragment xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+                                 xmlns="https://spacestation14.io" Margin="1 0 2 0">
+    <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
+    <BoxContainer Name="ExplanationBox" Orientation="Vertical" MaxWidth="400"  VerticalExpand="True" Margin="5">
+        <RichTextLabel Name ="Title" />
+        <RichTextLabel Name ="Subtitle"/>
+        <RichTextLabel Name ="Explanation"/>
+        <RichTextLabel Name ="Punishment" Margin="0,20"/>
+    </BoxContainer>
+    <BoxContainer Name="QuestionBox" Orientation="Horizontal" HorizontalAlignment="Center"  HorizontalExpand="True" VerticalExpand="False">
+        <Button Name="StartButton" Access="Public" Text="Start"/>
+        <Button Name="HomeButton" Access="Public" Text="Home" Visible="False"/>
+        <Button Name="YesButton" Access="Public" Text="Yes" Visible="False"/>
+        <Button Name="NoButton" Access="Public" Text="No" Visible="False"/>
+    </BoxContainer>
+</cartridges:CrimeAssistUiFragment>

Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs

@@ -0,0 +1,98 @@
+using Content.Client.Message;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using static Content.Client.DeltaV.CartridgeLoader.Cartridges.CrimeAssistUi;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class CrimeAssistUiFragment : BoxContainer
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    public event Action<bool>? OnSync;
+    private CrimeAssistPage _currentPage;
+    private List<CrimeAssistPage>? _pages;
+
+    public CrimeAssistUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        Orientation = LayoutOrientation.Vertical;
+        HorizontalExpand = true;
+        VerticalExpand = true;
+
+        _pages = new List<CrimeAssistPage>(_prototypeManager.EnumeratePrototypes<CrimeAssistPage>());
+
+        _currentPage = FindPageById("mainmenu");
+        UpdateUI(_currentPage);
+
+        StartButton.OnPressed += _ => UpdateUI(FindPageById(FindPageById("mainmenu").OnStart!));
+        HomeButton.OnPressed += _ => UpdateUI(FindPageById("mainmenu"));
+        YesButton.OnPressed += _ => AdvanceState(_currentPage!, true);
+        NoButton.OnPressed += _ => AdvanceState(_currentPage!, false);
+    }
+
+    public void AdvanceState(CrimeAssistPage currentPage, bool yesPressed)
+    {
+        UpdateUI(yesPressed ? FindPageById(currentPage.OnYes!) : FindPageById(currentPage.OnNo!));
+    }
+
+    public void UpdateUI(CrimeAssistPage page)
+    {
+        _currentPage = page;
+        bool isResult = page.LocKeyPunishment != null;
+
+        StartButton.Visible = page.OnStart != null;
+        YesButton.Visible = page.OnYes != null;
+        NoButton.Visible = page.OnNo != null;
+        HomeButton.Visible = page.OnStart == null;
+        Explanation.Visible = page.OnStart == null;
+
+        Subtitle.Visible = page.LocKeySeverity != null;
+        Punishment.Visible = page.LocKeyPunishment != null;
+
+        if (!isResult)
+        {
+            string question = $"\n[font size=15]{Loc.GetString(page.LocKey!)}[/font]";
+
+            if (question.ToLower().Contains("sophont"))
+            {
+                string sophontExplanation = Loc.GetString("crime-assist-sophont-explanation");
+                question += $"\n[font size=8][color=#999999]{sophontExplanation}[/color][/font]";
+            }
+
+            Title.SetMarkup(question);
+            Subtitle.SetMarkup(string.Empty);
+            Explanation.SetMarkup(string.Empty);
+            Punishment.SetMarkup(string.Empty);
+        }
+        else
+        {
+            string color = page.LocKeySeverity! switch
+            {
+                "crime-assist-crimetype-innocent" => "#39a300",
+                "crime-assist-crimetype-misdemeanour" => "#7b7b30",
+                "crime-assist-crimetype-felony" => "#7b5430",
+                "crime-assist-crimetype-capital" => "#7b2e30",
+                _ => "#ff00ff"
+            };
+
+            Title.SetMarkup("\n[bold][font size=23][color=#a4885c]" + Loc.GetString(page.LocKeyTitle!) + "[/color][/font][/bold]");
+            Subtitle.SetMarkup($"\n[font size=19][color={color}]" + Loc.GetString(page.LocKeySeverity!) + "[/color][/font]");
+            Explanation.SetMarkup("\n[title]" + Loc.GetString(page.LocKeyDescription!) + "[/title]\n");
+            Punishment.SetMarkup("[bold][font size=15]" + Loc.GetString(page.LocKeyPunishment!) + "[/font][/bold]");
+        }
+    }
+
+    private CrimeAssistPage FindPageById(string id)
+    {
+        return _pages?.Find(o => o.ID == id)!;
+    }
+}

Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs

@@ -0,0 +1,5 @@
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+[RegisterComponent]
+public sealed partial class CrimeAssistCartridgeComponent : Component
+{ }

Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs

@@ -0,0 +1,16 @@
+using Content.Shared.CartridgeLoader;
+using Content.Server.DeltaV.CartridgeLoader;
+using Content.Server.CartridgeLoader.Cartridges;
+using Content.Server.CartridgeLoader;
+
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed class CrimeAssistCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+    }
+}

Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs

@@ -1,5 +1,5 @@
-using Content.Server.Emp;
 using Content.Server.Explosion.Components;
+using Content.Server.Flash.Components;
 using Content.Server.GameTicking;
 using Content.Server.Popups;
 using Content.Server.Store.Components;
@@ -38,19 +38,25 @@ private void OnRoundEnded(RoundEndTextAppendEvent ev)
         var harmQuery = EntityQueryEnumerator<CombatModeComponent>();
         while (harmQuery.MoveNext(out var uid, out var _))
         {
-            _entityManager.EnsureComponent<PacifiedComponent>(uid);
+            EnsureComp<PacifiedComponent>(uid);
         }
 
-        var grenadeQuery = EntityQueryEnumerator<ExplodeOnTriggerComponent>();
+        var explosiveQuery = EntityQueryEnumerator<ExplosiveComponent>();
+        while (explosiveQuery.MoveNext(out var uid, out var _))
+        {
+            RemComp<ExplosiveComponent>(uid);
+        }
+
+        var grenadeQuery = EntityQueryEnumerator<OnUseTimerTriggerComponent>();
         while (grenadeQuery.MoveNext(out var uid, out var _))
         {
-            _entityManager.RemoveComponent<ExplodeOnTriggerComponent>(uid);
+            RemComp<OnUseTimerTriggerComponent>(uid);
         }
 
-        var empQuery = EntityQueryEnumerator<EmpOnTriggerComponent>();
-        while (empQuery.MoveNext(out var uid, out var _))
+        var flashQuery = EntityQueryEnumerator<FlashComponent>();
+        while (flashQuery.MoveNext(out var uid, out var _))
         {
-            _entityManager.RemoveComponent<EmpOnTriggerComponent>(uid);
+            RemComp<FlashComponent>(uid);
         }
 
         var uplinkQuery = EntityQueryEnumerator<StoreComponent>();

Content.Server/DeltaV/Speech/Components/ScottishAccentComponent.cs

@@ -0,0 +1,8 @@
+using Content.Server.DeltaV.Speech.EntitySystems;
+
+namespace Content.Server.DeltaV.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(ScottishAccentSystem))]
+public sealed partial class ScottishAccentComponent : Component
+{ }

Content.Server/DeltaV/Speech/EntitySystems/ScottishAccentSystem.cs

@@ -0,0 +1,33 @@
+using Content.Server.DeltaV.Speech.Components;
+using Content.Server.Speech;
+using Content.Server.Speech.EntitySystems;
+using System.Text.RegularExpressions;
+
+namespace Content.Server.DeltaV.Speech.EntitySystems;
+
+public sealed class ScottishAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScottishAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    // converts left word when typed into the right word. For example typing you becomes ye.
+    public string Accentuate(string message, ScottishAccentComponent component)
+    {
+        var msg = message;
+
+        msg = _replacement.ApplyReplacements(msg, "scottish");
+
+        return msg;
+    }
+
+    private void OnAccentGet(EntityUid uid, ScottishAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}

Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs

@@ -1,18 +1,18 @@
-using System.Threading;
-using Content.Shared.Verbs;
-using Content.Shared.Item;
-using Content.Shared.Hands;
+using Content.Server.DoAfter;
+using Content.Server.Storage.EntitySystems;
 using Content.Shared.DoAfter;
+using Content.Shared.Hands;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Item;
 using Content.Shared.Item.PseudoItem;
 using Content.Shared.Storage;
-using Content.Server.Storage.EntitySystems;
-using Content.Server.DoAfter;
 using Content.Shared.Tag;
+using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Item.PseudoItem;
-public sealed partial class PseudoItemSystem : EntitySystem
+
+public sealed class PseudoItemSystem : EntitySystem
 {
     [Dependency] private readonly StorageSystem _storageSystem = default!;
     [Dependency] private readonly ItemSystem _itemSystem = default!;
@@ -31,6 +31,7 @@ public override void Initialize()
         SubscribeLocalEvent<PseudoItemComponent, GettingPickedUpAttemptEvent>(OnGettingPickedUpAttempt);
         SubscribeLocalEvent<PseudoItemComponent, DropAttemptEvent>(OnDropAttempt);
         SubscribeLocalEvent<PseudoItemComponent, PseudoItemInsertDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<PseudoItemComponent, ContainerGettingInsertedAttemptEvent>(OnInsertAttempt);
     }
 
     private void AddInsertVerb(EntityUid uid, PseudoItemComponent component, GetVerbsEvent<InnateVerb> args)
@@ -97,7 +98,8 @@ private void OnEntRemoved(EntityUid uid, PseudoItemComponent component, EntGotRe
         component.Active = false;
     }
 
-    private void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component, GettingPickedUpAttemptEvent args)
+    private void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component,
+        GettingPickedUpAttemptEvent args)
     {
         if (args.User == args.Item)
             return;
@@ -111,6 +113,7 @@ private void OnDropAttempt(EntityUid uid, PseudoItemComponent component, DropAtt
         if (component.Active)
             args.Cancel();
     }
+
     private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Args.Used == null)
@@ -119,7 +122,8 @@ private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEven
         args.Handled = TryInsert(args.Args.Used.Value, uid, component);
     }
 
-    public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemComponent component, StorageComponent? storage = null)
+    public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemComponent component,
+        StorageComponent? storage = null)
     {
         if (!Resolve(storageUid, ref storage))
             return false;
@@ -139,16 +143,17 @@ public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemCompon
         }
 
         component.Active = true;
-        Transform(storageUid).AttachToGridOrMap();
         return true;
     }
-    private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUid storageEntity, PseudoItemComponent? pseudoItem = null)
+
+    private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUid storageEntity,
+        PseudoItemComponent? pseudoItem = null)
     {
         if (!Resolve(toInsert, ref pseudoItem))
             return;
 
         var ev = new PseudoItemInsertDoAfterEvent();
-        var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, target: toInsert, used: storageEntity)
+        var args = new DoAfterArgs(EntityManager, inserter, 5f, ev, toInsert, toInsert, storageEntity)
         {
             BreakOnTargetMove = true,
             BreakOnUserMove = true,
@@ -157,4 +162,13 @@ private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUi
 
         _doAfter.TryStartDoAfter(args);
     }
+
+    private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component,
+        ContainerGettingInsertedAttemptEvent args)
+    {
+        if (!component.Active)
+            return;
+        // This hopefully shouldn't trigger, but this is a failsafe just in case so we dont bluespace them cats
+        args.Cancel();
+    }
 }

Content.Shared/DeltaV/CartridgeLoader/Cartridges/CrimeAssistPage.cs

@@ -0,0 +1,35 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+
+[Prototype("crimeAssistPage")]
+public sealed partial class CrimeAssistPage : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = "";
+
+    [DataField("onStart")]
+    public string? OnStart { get; private set; }
+
+    [DataField("locKey")]
+    public string? LocKey { get; private set; }
+
+    [DataField("onYes")]
+    public string? OnYes { get; private set; }
+
+    [DataField("onNo")]
+    public string? OnNo { get; private set; }
+
+    [DataField("locKeyTitle")]
+    public string? LocKeyTitle { get; private set; }
+
+    [DataField("locKeyDescription")]
+    public string? LocKeyDescription { get; private set; }
+
+    [DataField("locKeySeverity")]
+    public string? LocKeySeverity { get; private set; }
+
+    [DataField("locKeyPunishment")]
+    public string? LocKeyPunishment { get; private set; }
+}