Skip to content

Commit

Permalink
Merge branch 'master' into seclethals
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffiestFloof authored Sep 27, 2023
2 parents 6704d71 + 827b25a commit 9d26940
Show file tree
Hide file tree
Showing 1,804 changed files with 174,810 additions and 72,477 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,6 @@
/Content.*/Atmos/ @Partmedia
/Content.*/Botany/ @Partmedia

#Jezi
/Content.*/Medical @Jezithyr
/Content.*/Body @Jezithyr
72 changes: 0 additions & 72 deletions .github/workflows/update-wiki.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Robust.Client.GameObjects;
using Robust.Shared.Prototypes;
using static Content.Shared.Access.Components.IdCardConsoleComponent;

namespace Content.Client.Access.UI
{
public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface
Expand Down
Loading

0 comments on commit 9d26940

Please sign in to comment.