From 53aaba2f17fb382a669af70ee0e3b05b36b13cc3 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 25 Jan 2025 17:55:44 -0500
Subject: [PATCH 1/2] Don't Assume Sessions Are Real (#1655)

# Description

This system was just blindly assuming a session couldn't be null without
proving it wasn't, and two different functions both incorrectly made
this assumption. I have no idea how the hell they managed to sneak it
past the compiler's null reference test.
---
 Content.Server/Administration/Systems/AdminSystem.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 8d6e2fa37499..aa126b338492 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -105,13 +105,11 @@ private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
 
             foreach (var (id, data) in _playerList)
             {
-                if (!data.ActiveThisRound)
+                if (!data.ActiveThisRound
+                    || !_playerManager.TryGetPlayerData(id, out var playerData)
+                    || !_playerManager.TryGetSessionById(id, out var session))
                     continue;
 
-                if (!_playerManager.TryGetPlayerData(id, out var playerData))
-                    return;
-
-                _playerManager.TryGetSessionById(id, out var session);
                 _playerList[id] = GetPlayerInfo(playerData, session);
             }
 
@@ -218,7 +216,7 @@ private void SendFullPlayerList(ICommonSession playerSession)
             RaiseNetworkEvent(ev, playerSession.Channel);
         }
 
-        private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession? session)
+        private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession session)
         {
             var name = data.UserName;
             var entityName = string.Empty;

From 8eafa7ab0f7295bdd8350fc9c2954b02e7d50d1b Mon Sep 17 00:00:00 2001
From: Eris <erisfiregamer1@gmail.com>
Date: Sat, 25 Jan 2025 18:46:21 -0500
Subject: [PATCH 2/2] Hotfix for Disk Burner Examine (#1656)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Had an aneurysm seeing this live on arcadis and webedited a fix. Fixes
an issue on examining a disk burner without a board.

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

no

Signed-off-by: Eris <erisfiregamer1@gmail.com>
---
 Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs b/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs
index 0856b2fbe6b8..4c368186ef72 100644
--- a/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs
+++ b/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs
@@ -87,7 +87,7 @@ private void OnExamined(EntityUid uid, DiskBurnerComponent component, ExaminedEv
                 missing.Add("disk");
 
             if (boardSlot.Item is null)
-                missing.Add("or");
+                missing.Add("board");
 
             args.PushMarkup(Loc.GetString("disk-burner-missing", ("missing", string.Join(", or ", missing))));
             return;