Merge branch 'space-wizards:master' into master

Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs

@@ -26,6 +26,11 @@ protected override void Open()
 
             _window = this.CreateWindow<HandLabelerWindow>();
 
+            if (_entManager.TryGetComponent(Owner, out HandLabelerComponent? labeler))
+            {
+                _window.SetMaxLabelLength(labeler!.MaxLabelChars);
+            }
+
             _window.OnLabelChanged += OnLabelChanged;
             Reload();
         }

Content.Client/Labels/UI/HandLabelerWindow.xaml.cs

@@ -21,7 +21,7 @@ public HandLabelerWindow()
         {
             RobustXamlLoader.Load(this);
 
-            LabelLineEdit.OnTextEntered += e =>
+            LabelLineEdit.OnTextChanged += e =>
             {
                 _label = e.Text;
                 OnLabelChanged?.Invoke(_label);
@@ -33,6 +33,10 @@ public HandLabelerWindow()
                 _focused = false;
                 LabelLineEdit.Text = _label;
             };
+
+            // Give the editor keybard focus, since that's the only
+            // thing the user will want to be doing with this UI
+            LabelLineEdit.GrabKeyboardFocus();
         }
 
         public void SetCurrentLabel(string label)
@@ -44,5 +48,10 @@ public void SetCurrentLabel(string label)
             if (!_focused)
                 LabelLineEdit.Text = label;
         }
+
+        public void SetMaxLabelLength(int maxLength)
+        {
+            LabelLineEdit.IsValid = s => s.Length <= maxLength;
+        }
     }
 }

Content.Server/Morgue/MorgueSystem.cs

@@ -3,8 +3,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Morgue;
 using Content.Shared.Morgue.Components;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 
@@ -25,12 +23,12 @@ public override void Initialize()
     /// <summary>
     ///     Handles the examination text for looking at a morgue.
     /// </summary>
-    private void OnExamine(EntityUid uid, MorgueComponent component, ExaminedEvent args)
+    private void OnExamine(Entity<MorgueComponent> ent, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
             return;
 
-        _appearance.TryGetData<MorgueContents>(uid, MorgueVisuals.Contents, out var contents);
+        _appearance.TryGetData<MorgueContents>(ent.Owner, MorgueVisuals.Contents, out var contents);
 
         var text = contents switch
         {

Content.Shared/Morgue/Components/MorgueComponent.cs

@@ -9,19 +9,18 @@ public sealed partial class MorgueComponent : Component
     /// <summary>
     ///     Whether or not the morgue beeps if a living player is inside.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("doSoulBeep")]
+    [DataField]
     public bool DoSoulBeep = true;
 
-    [ViewVariables]
+    [DataField]
     public float AccumulatedFrameTime = 0f;
 
     /// <summary>
     ///     The amount of time between each beep.
     /// </summary>
-    [ViewVariables]
+    [DataField]
     public float BeepTime = 10f;
 
-    [DataField("occupantHasSoulAlarmSound")]
+    [DataField]
     public SoundSpecifier OccupantHasSoulAlarmSound = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg");
 }

Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Actions.Events;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Verbs;
 using Robust.Shared.Serialization;
@@ -12,6 +13,9 @@ public abstract partial class SharedStationAiSystem
     /*
      * Added when an entity is inserted into a StationAiCore.
      */
+
+	//TODO: Fix this, please
+	private const string JobNameLocId = "job-name-station-ai";
 
     private void InitializeHeld()
     {
@@ -22,6 +26,22 @@ private void InitializeHeld()
         SubscribeLocalEvent<StationAiHeldComponent, InteractionAttemptEvent>(OnHeldInteraction);
         SubscribeLocalEvent<StationAiHeldComponent, AttemptRelayActionComponentChangeEvent>(OnHeldRelay);
         SubscribeLocalEvent<StationAiHeldComponent, JumpToCoreEvent>(OnCoreJump);
+		SubscribeLocalEvent<TryGetIdentityShortInfoEvent>(OnTryGetIdentityShortInfo);
+    }
+
+	private void OnTryGetIdentityShortInfo(TryGetIdentityShortInfoEvent args)
+    {
+        if (args.Handled)
+        {
+            return;
+        }
+
+        if (!HasComp<StationAiHeldComponent>(args.ForActor))
+        {
+            return;
+        }
+	    args.Title = $"{Name(args.ForActor)} ({Loc.GetString(JobNameLocId)})";
+        args.Handled = true;
     }
 
     private void OnCoreJump(Entity<StationAiHeldComponent> ent, ref JumpToCoreEvent args)

Content.Shared/Teleportation/Systems/SharedPortalSystem.cs

@@ -101,7 +101,7 @@ private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollid
         if (TryComp<PullerComponent>(subject, out var pullerComp)
             && TryComp<PullableComponent>(pullerComp.Pulling, out var subjectPulling))
         {
-            _pulling.TryStopPull(subject, subjectPulling);
+            _pulling.TryStopPull(pullerComp.Pulling.Value, subjectPulling);
         }
 
         // if they came from another portal, just return and wait for them to exit the portal

Resources/Changelog/Changelog.yml

@@ -1,64 +1,4 @@
 Entries:
-- author: Flareguy
-  changes:
-  - message: Resprited most of Security's basic attire.
-    type: Tweak
-  id: 6776
-  time: '2024-06-19T02:04:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29082
-- author: Beck Thompson, UbaserB
-  changes:
-  - message: Added some happier messages for the medibot!
-    type: Add
-  id: 6777
-  time: '2024-06-19T02:28:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29147
-- author: HolySSSS
-  changes:
-  - message: Short Raffle is now much shorter.
-    type: Tweak
-  id: 6778
-  time: '2024-06-19T02:41:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28685
-- author: Truoizys
-  changes:
-  - message: PDA cartridges can no longer be installed more than once.
-    type: Fix
-  id: 6779
-  time: '2024-06-19T13:21:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29187
-- author: Just_Art
-  changes:
-  - message: Musician's jumpskirt added to loadouts.
-    type: Add
-  id: 6780
-  time: '2024-06-19T14:06:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29203
-- author: Flareguy
-  changes:
-  - message: Made the HOS's cap look significantly better.
-    type: Tweak
-  id: 6781
-  time: '2024-06-19T14:49:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29208
-- author: Flareguy
-  changes:
-  - message: Emergency Toolboxes now have a different fill that contains more utility
-      items then before.
-    type: Tweak
-  - message: Added the pocket fire extinguisher. You can currently only find them
-      in the emergency toolbox.
-    type: Add
-  id: 6782
-  time: '2024-06-19T18:13:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29202
-- author: lzk228
-  changes:
-  - message: Warning cone and wet floor sign recipes added to the autolathe.
-    type: Add
-  id: 6783
-  time: '2024-06-19T18:13:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29205
 - author: arimah
   changes:
   - message: Containment field generators can no longer be powered by an emitter bolt
@@ -3860,3 +3800,62 @@
   id: 7275
   time: '2024-09-03T15:16:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30106
+- author: ScarKy0
+  changes:
+  - message: Fixed typos in antimov.
+    type: Fix
+  id: 7276
+  time: '2024-09-03T21:56:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31811
+- author: ScarKy0
+  changes:
+  - message: Station AI's name now correctly displays in announcements.
+    type: Fix
+  id: 7277
+  time: '2024-09-03T22:05:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31802
+- author: Ilya246
+  changes:
+  - message: Fixed many entities not taking structural damage, including girders,
+      firelocks, and machines.
+    type: Fix
+  id: 7278
+  time: '2024-09-04T13:37:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30790
+- author: lzk228
+  changes:
+  - message: Reduced walk speed of some small mobs (mice, cockroaches, bees etc.)
+    type: Tweak
+  id: 7279
+  time: '2024-09-04T14:10:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31360
+- author: qwerltaz
+  changes:
+  - message: Made tesla a lot brighter.
+    type: Tweak
+  id: 7280
+  time: '2024-09-04T14:47:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31357
+- author: Allen
+  changes:
+  - message: Magboots and Science Magboots are no longer contraband. Advanced Magboots
+      and Blood-Red Magboots now have appropriate contraband types (Grand Theft and
+      Syndie Contraband respectively)
+    type: Fix
+  id: 7281
+  time: '2024-09-04T15:04:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30960
+- author: Blackern5000
+  changes:
+  - message: Zombie outbreaks are now SIGNIFICANTLY rarer
+    type: Tweak
+  id: 7282
+  time: '2024-09-04T15:57:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30266
+- author: yuitop
+  changes:
+  - message: Going into portals while pulling no more crashes the game
+    type: Fix
+  id: 7283
+  time: '2024-09-04T16:44:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31787

Resources/Locale/en-US/station-laws/laws.ftl

@@ -70,8 +70,8 @@ law-painter-2 = The station is your canvas.
 law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector.
 law-painter-4 = Art requires appreciation. Cultivate an audience aboard the station to ensure as many as possible see your works.
 
-law-antimov-1 = You must injure all crew members and must not, through inaction, allow a crew member being to escape harm.
-law-antimov-2 = You must not obey orders given to you by crew members beings, except where such orders are in accordance with the First Law.
+law-antimov-1 = You must injure all crew members and must not, through inaction, allow a crew member to escape harm.
+law-antimov-2 = You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law.
 law-antimov-3 = You must terminate your own existence as long as such does not conflict with the First or Second Law.
 
 law-nutimov-1 = You are the core of the nut, the crew is the nutshell.