Skip to content

Commit 1e60b75

Browse files
DEATHB4DEFEATPlykiyaFungiFellowosjarwUbaserB
authored
Catch-Up Cherry Pick 2 (#944)
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog :cl: - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: FungiFellow <[email protected]> Co-authored-by: osjarw <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: beck-thompson <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Magnus Larsen <[email protected]> Co-authored-by: Hanz <[email protected]> Co-authored-by: Kukutis96513 <[email protected]> Co-authored-by: potato1234_x <[email protected]> Co-authored-by: Gotimanga <[email protected]> Co-authored-by: Mangohydra <[email protected]> Co-authored-by: TsjipTsjip <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: Morb <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: KrasnoshchekovPavel <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: KittenColony <[email protected]> Co-authored-by: ShadowCommander <[email protected]> Co-authored-by: Mr. 27 <[email protected]> Co-authored-by: T-Stalker <[email protected]> Co-authored-by: ERROR404 <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: Jezithyr <[email protected]> Co-authored-by: Psychpsyo <[email protected]> Co-authored-by: no <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: Ciac32 <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: NotSoDana <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: nao fujiwara <[email protected]> Co-authored-by: Michael <[email protected]> Co-authored-by: Vasilis <[email protected]> Co-authored-by: Lamrr <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: Jay <[email protected]> Co-authored-by: Just-a-Unity-Dev <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: Flareguy <[email protected]> Co-authored-by: Tyzemol <[email protected]> Co-authored-by: Alzore <[email protected]> Co-authored-by: Pok <[email protected]> Co-authored-by: RumiTiger <[email protected]> Co-authored-by: Verm <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: Killerqu00 <[email protected]> Co-authored-by: Ty Ashley <[email protected]> Co-authored-by: exincore <[email protected]> Co-authored-by: 0x6273 <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: Ygg01 <[email protected]> Co-authored-by: Łukasz Mędrek <[email protected]> Co-authored-by: Hannah Giovanna Dawson <[email protected]> Co-authored-by: TurboTracker <[email protected]> Co-authored-by: OnsenCapy <[email protected]> Co-authored-by: pigeonpeas <[email protected]> Co-authored-by: Cojoke <[email protected]> Co-authored-by: Tornado Tech <[email protected]> Co-authored-by: Rio <[email protected]> Co-authored-by: vorkathbruh <[email protected]> Co-authored-by: Sphiral <[email protected]> Co-authored-by: PrPleGoo <[email protected]> Co-authored-by: Moomoobeef <[email protected]> Co-authored-by: username <[email protected]> Co-authored-by: Boaz1111 <[email protected]> Co-authored-by: Джексон Миссиссиппи <[email protected]> Co-authored-by: Brandon Li <[email protected]> Co-authored-by: Jajsha <[email protected]> Co-authored-by: RiceMar1244 <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: youtissoum <[email protected]> Co-authored-by: ike709 <[email protected]> Co-authored-by: icekot8 <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Geekyhobo <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]>
1 parent 1bb7f1b commit 1e60b75

File tree

2,789 files changed

+57717
-32425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,789 files changed

+57717
-32425
lines changed

‎.editorconfig

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ indent_style = space
99
tab_width = 4
1010

1111
# New line preferences
12-
end_of_line = crlf:suggestion
12+
#end_of_line = crlf
1313
insert_final_newline = true
1414
trim_trailing_whitespace = true
15+
max_line_length = 120
1516

1617
#### .NET Coding Conventions ####
1718

@@ -104,7 +105,6 @@ csharp_preferred_modifier_order = public, private, protected, internal, new, abs
104105

105106
# 'using' directive preferences
106107
csharp_using_directive_placement = outside_namespace:silent
107-
csharp_style_namespace_declarations = file_scoped:suggestion
108108

109109
#### C# Formatting Rules ####
110110

@@ -337,7 +337,11 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
337337

338338
# ReSharper properties
339339
resharper_braces_for_ifelse = required_for_multiline
340+
resharper_csharp_wrap_arguments_style = chop_if_long
341+
resharper_csharp_wrap_parameters_style = chop_if_long
340342
resharper_keep_existing_attribute_arrangement = true
343+
resharper_wrap_chained_binary_patterns = chop_if_long
344+
resharper_wrap_chained_method_calls = chop_if_long
341345

342346
[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
343347
indent_size = 2

‎.github/labeler.yml

+38-21
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,56 @@
11
"Changes: Audio":
2-
- "**/*.ogg"
3-
2+
- changed-files:
3+
- any-glob-to-any-file: "**/*.ogg"
4+
45
"Changes: C#":
5-
- "**/*.cs"
6+
- changed-files:
7+
- any-glob-to-any-file: "**/*.cs"
68

79
"Changes: Config":
8-
- "**/*.toml"
9-
- "**/*.config"
10-
- "*.json"
11-
- ".github/*.yml"
12-
- ".github/*.json"
13-
- ".vscode/*.json"
14-
- ".editorconfig"
10+
- changed-files:
11+
- any-glob-to-any-file:
12+
- "**/*.toml"
13+
- "**/*.config"
14+
- "*.json"
15+
- ".github/*.yml"
16+
- ".github/*.json"
17+
- ".vscode/*.json"
18+
- ".editorconfig"
1519

1620
"Changes: Documentation":
17-
- "**/*.xml"
18-
- "**/*.md"
21+
- changed-files:
22+
- any-glob-to-any-file:
23+
- "**/*.xml"
24+
- "**/*.md"
1925

2026
"Changes: Localization":
21-
- 'Resources/Locale/**/*.ftl'
27+
- changed-files:
28+
- any-glob-to-any-file: 'Resources/Locale/**/*.ftl'
2229

2330
"Changes: Map":
24-
- "Resources/Maps/**/*.yml"
25-
- "Resources/Prototypes/Maps/**/*.yml"
31+
- changed-files:
32+
- any-glob-to-any-file:
33+
- "Resources/Maps/**/*.yml"
34+
- "Resources/Prototypes/Maps/**/*.yml"
2635

2736
"Changes: Sprite":
28-
- "**/*.rsi/*.png"
29-
- "**/*.rsi/*.json"
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- "**/*.rsi/*.png"
40+
- "**/*.rsi/*.json"
3041

3142
"Changes: UI":
32-
- "**/*.xaml*"
43+
- changed-files:
44+
- any-glob-to-any-file: "**/*.xaml*"
3345

3446
"Changes: YML":
35-
- any: ["**/*.yml"]
36-
all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
47+
- changed-files:
48+
- any-glob-to-any-file:
49+
- "**/*.yml"
50+
- all-globs-to-all-files:
51+
- "!Resources/Maps/**/*.yml",
52+
- "!Resources/Prototypes/Maps/**/*.yml"
3753

3854
"Changes: Workflow":
39-
- ".github/workflows/*.yml"
55+
- changed-files:
56+
- any-glob-to-any-file: ".github/workflows/*.yml"

‎.github/workflows/conflict-labeler.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
name: Check Merge Conflicts
22

33
on:
4-
push:
5-
branches:
6-
- master
74
pull_request_target:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
- ready_for_review
810

911
jobs:
1012
Label:
11-
if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
13+
if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' )
1214
runs-on: ubuntu-latest
1315
steps:
1416
- name: Check for Merge Conflicts
15-
uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
17+
uses: eps1lon/actions-label-merge-conflict@v3.0.0
1618
with:
1719
dirtyLabel: "Status: Merge Conflict"
1820
repoToken: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/labeler-pr.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ on:
66
jobs:
77
labeler:
88
if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
9+
permissions:
10+
contents: read
11+
pull-requests: write
912
runs-on: ubuntu-latest
1013
steps:
11-
- uses: actions/labeler@v3
12-
with:
13-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
14+
- uses: actions/labeler@v5

‎Content.Client/Access/IdCardSystem.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
namespace Content.Client.Access;
44

5-
public sealed class IdCardSystem : SharedIdCardSystem
6-
{
7-
}
5+
public sealed class IdCardSystem : SharedIdCardSystem;

‎Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ private void OnJobChanged(string newJob)
4040
SendMessage(new AgentIDCardJobChangedMessage(newJob));
4141
}
4242

43-
public void OnJobIconChanged(string newJobIcon)
43+
public void OnJobIconChanged(string newJobIconId)
4444
{
45-
SendMessage(new AgentIDCardJobIconChangedMessage(newJobIcon));
45+
SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
4646
}
4747

4848
/// <summary>
@@ -57,7 +57,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
5757

5858
_window.SetCurrentName(cast.CurrentName);
5959
_window.SetCurrentJob(cast.CurrentJob);
60-
_window.SetAllowedIcons(cast.Icons);
60+
_window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId);
6161
}
6262

6363
protected override void Dispose(bool disposing)

‎Content.Client/Access/UI/AgentIDCardWindow.xaml.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public AgentIDCardWindow(AgentIDCardBoundUserInterface bui)
3838
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
3939
}
4040

41-
public void SetAllowedIcons(HashSet<string> icons)
41+
public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
4242
{
4343
IconGrid.DisposeAllChildren();
4444

@@ -79,6 +79,10 @@ public void SetAllowedIcons(HashSet<string> icons)
7979
jobIconButton.AddChild(jobIconTexture);
8080
jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIcon.ID);
8181
IconGrid.AddChild(jobIconButton);
82+
83+
if (jobIconId.Equals(currentJobIconId))
84+
jobIconButton.Pressed = true;
85+
8286
i++;
8387
}
8488
}

‎Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Content.Shared.Access;
22
using Content.Shared.Access.Components;
3-
using Content.Shared.Access;
43
using Content.Shared.Access.Systems;
54
using Content.Shared.Containers.ItemSlots;
65
using Content.Shared.CrewManifest;

‎Content.Client/Actions/ActionsSystem.cs

+3
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,10 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action)
249249
if (action.ClientExclusive)
250250
{
251251
if (instantAction.Event != null)
252+
{
252253
instantAction.Event.Performer = user;
254+
instantAction.Event.Action = actionId;
255+
}
253256

254257
PerformAction(user, actions, actionId, instantAction, instantAction.Event, GameTiming.CurTime);
255258
}

‎Content.Client/Administration/Components/HeadstandComponent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Content.Client.Administration.Components;
55

6-
[RegisterComponent, NetworkedComponent]
6+
[RegisterComponent]
77
public sealed partial class HeadstandComponent : SharedHeadstandComponent
88
{
99

‎Content.Client/Administration/Components/KillSignComponent.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
namespace Content.Client.Administration.Components;
55

6-
[NetworkedComponent, RegisterComponent]
7-
public sealed partial class KillSignComponent : SharedKillSignComponent
8-
{ }
6+
[RegisterComponent]
7+
public sealed partial class KillSignComponent : SharedKillSignComponent;

‎Content.Client/Administration/Managers/ClientAdminManager.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,15 @@ void IPostInjectInit.PostInject()
126126

127127
public AdminData? GetAdminData(EntityUid uid, bool includeDeAdmin = false)
128128
{
129-
return uid == _player.LocalEntity ? _adminData : null;
129+
if (uid == _player.LocalEntity && (_adminData?.Active ?? includeDeAdmin))
130+
return _adminData;
131+
132+
return null;
130133
}
131134

132135
public AdminData? GetAdminData(ICommonSession session, bool includeDeAdmin = false)
133136
{
134-
if (_player.LocalUser == session.UserId)
137+
if (_player.LocalUser == session.UserId && (_adminData?.Active ?? includeDeAdmin))
135138
return _adminData;
136139

137140
return null;

‎Content.Client/Administration/Systems/AdminVerbSystem.cs

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
using Content.Shared.Administration;
2+
using Content.Shared.Administration.Managers;
3+
using Content.Shared.Mind.Components;
14
using Content.Shared.Verbs;
25
using Robust.Client.Console;
36
using Robust.Shared.Utility;
@@ -11,10 +14,12 @@ sealed class AdminVerbSystem : EntitySystem
1114
{
1215
[Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
1316
[Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!;
17+
[Dependency] private readonly ISharedAdminManager _admin = default!;
1418

1519
public override void Initialize()
1620
{
1721
SubscribeLocalEvent<GetVerbsEvent<Verb>>(AddAdminVerbs);
22+
1823
}
1924

2025
private void AddAdminVerbs(GetVerbsEvent<Verb> args)
@@ -33,6 +38,24 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
3338
};
3439
args.Verbs.Add(verb);
3540
}
41+
42+
if (!_admin.IsAdmin(args.User))
43+
return;
44+
45+
if (_admin.HasAdminFlag(args.User, AdminFlags.Admin))
46+
args.ExtraCategories.Add(VerbCategory.Admin);
47+
48+
if (_admin.HasAdminFlag(args.User, AdminFlags.Fun) && HasComp<MindContainerComponent>(args.Target))
49+
args.ExtraCategories.Add(VerbCategory.Antag);
50+
51+
if (_admin.HasAdminFlag(args.User, AdminFlags.Debug))
52+
args.ExtraCategories.Add(VerbCategory.Debug);
53+
54+
if (_admin.HasAdminFlag(args.User, AdminFlags.Fun))
55+
args.ExtraCategories.Add(VerbCategory.Smite);
56+
57+
if (_admin.HasAdminFlag(args.User, AdminFlags.Admin))
58+
args.ExtraCategories.Add(VerbCategory.Tricks);
3659
}
3760
}
3861
}

0 commit comments

Comments
 (0)