From 4c1961de6154a84f889a58bfccd04294dc20ce8b Mon Sep 17 00:00:00 2001 From: Michael Chessall Date: Thu, 30 Apr 2026 18:41:05 -0600 Subject: [PATCH 1/6] rebalance syndicate items --- Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml b/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml index ec98abcc139..0d3546fceee 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml @@ -249,9 +249,9 @@ id: BriefcaseSyndieSniperBundleFilled icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } product: BriefcaseSyndieSniperBundleFilled - cost: 11000 + cost: 30000 category: cargoproduct-category-name-syndicate - group: syndicatemarket3 + group: syndicatemarket5 - type: cargoProduct id: ChemicalSynthesisKit @@ -259,7 +259,7 @@ product: ChemicalSynthesisKit cost: 700 category: cargoproduct-category-name-syndicate - group: syndicatemarket + group: syndicatemarket3 - type: cargoProduct id: SlipocalypseClusterSoap From 1d717ae33d5d4e6d1a5616d587a6b42cddf4572b Mon Sep 17 00:00:00 2001 From: Michael Chessall Date: Fri, 1 May 2026 15:59:27 -0600 Subject: [PATCH 2/6] Remove unnecessary networking --- .../CrewAssignments/Components/CrewAssignmentsComponent.cs | 5 +---- .../CrewMetaRecords/Components/CrewMetaRecordsComponent.cs | 7 +++++-- .../CrewRecords/Components/CrewRecordsComponent.cs | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Content.Shared/CrewAssignments/Components/CrewAssignmentsComponent.cs b/Content.Shared/CrewAssignments/Components/CrewAssignmentsComponent.cs index 6d57e2be0f7..38bae780abd 100644 --- a/Content.Shared/CrewAssignments/Components/CrewAssignmentsComponent.cs +++ b/Content.Shared/CrewAssignments/Components/CrewAssignmentsComponent.cs @@ -2,15 +2,12 @@ namespace Content.Shared.CrewAssignments.Components; -[RegisterComponent, NetworkedComponent] -[AutoGenerateComponentState] +[RegisterComponent] public sealed partial class CrewAssignmentsComponent : Component { [DataField] - [AutoNetworkedField] public Dictionary CrewAssignments { get; set; } = new(); [DataField] - [AutoNetworkedField] public int NextID = 1; public bool TryGetAssignment(int id, out CrewAssignment? assignment) { diff --git a/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs b/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs index 7a385ac3c7f..2123963893c 100644 --- a/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs +++ b/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs @@ -1,12 +1,12 @@ using Content.Shared.CrewAssignments.Prototypes; using Content.Shared.CrewAssignments.Systems; +using Content.Shared.MessageBoard.Components; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; namespace Content.Shared.CrewMetaRecords; -[RegisterComponent, NetworkedComponent] -[AutoGenerateComponentState] +[RegisterComponent] public sealed partial class CrewMetaRecordsComponent : Component { [DataField] @@ -23,6 +23,9 @@ public sealed partial class CrewMetaRecordsComponent : Component public List CompletedObjectives { get; set; } = new(); [DataField] public List CodexEntries { get; set; } = new(); + + [DataField] + public List MessageBoardEntries { get; set; } = new(); [DataField] [AutoNetworkedField] public Dictionary CrewMetaRecords { get; set; } = new(); diff --git a/Content.Shared/CrewRecords/Components/CrewRecordsComponent.cs b/Content.Shared/CrewRecords/Components/CrewRecordsComponent.cs index 97896f2f7a4..338c159b844 100644 --- a/Content.Shared/CrewRecords/Components/CrewRecordsComponent.cs +++ b/Content.Shared/CrewRecords/Components/CrewRecordsComponent.cs @@ -2,12 +2,10 @@ namespace Content.Shared.CrewRecords.Components; -[RegisterComponent, NetworkedComponent] -[AutoGenerateComponentState] +[RegisterComponent] public sealed partial class CrewRecordsComponent : Component { [DataField] - [AutoNetworkedField] public Dictionary CrewRecords { get; set; } = new(); public bool TryGetRecord(string name, out CrewRecord? record) From 0ec9882a60f9aa4485e3c3032a38eeea550c8c26 Mon Sep 17 00:00:00 2001 From: Michael Chessall Date: Fri, 1 May 2026 16:00:00 -0600 Subject: [PATCH 3/6] First half of message board system. --- Content.Client/Content.Client.csproj | 12 +++ .../MessageBoard/UI/CreateEntry.xaml | 16 ++++ .../MessageBoard/UI/CreateEntry.xaml.cs | 17 ++++ .../MessageBoard/UI/MessageBoard.xaml | 64 +++++++++++++++ .../MessageBoard/UI/MessageBoard.xaml.cs | 29 +++++++ .../UI/MessageBoardBoundUserInterface.cs | 78 +++++++++++++++++++ .../Systems/MessageBoardSystem.cs | 54 +++++++++++++ .../StationModificationConsoleComponent.cs | 30 +------ .../Components/MessageBoardComponent.cs | 74 ++++++++++++++++++ .../Systems/SharedMessageBoardSystem.cs | 16 ++++ .../Machines/Computers/computers.yml | 34 ++++++++ 11 files changed, 395 insertions(+), 29 deletions(-) create mode 100644 Content.Client/MessageBoard/UI/CreateEntry.xaml create mode 100644 Content.Client/MessageBoard/UI/CreateEntry.xaml.cs create mode 100644 Content.Client/MessageBoard/UI/MessageBoard.xaml create mode 100644 Content.Client/MessageBoard/UI/MessageBoard.xaml.cs create mode 100644 Content.Client/MessageBoard/UI/MessageBoardBoundUserInterface.cs create mode 100644 Content.Server/MessageBoard/Systems/MessageBoardSystem.cs create mode 100644 Content.Shared/MessageBoard/Components/MessageBoardComponent.cs create mode 100644 Content.Shared/MessageBoard/Systems/SharedMessageBoardSystem.cs diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 4c6096ef571..b1a5200be8a 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -6,6 +6,9 @@ RA0032;nullable + + + @@ -30,6 +33,9 @@ MSBuild:Compile + + MSBuild:Compile + @@ -82,6 +88,9 @@ + + + MSBuild:Compile @@ -93,4 +102,7 @@ MSBuild:Compile + + + diff --git a/Content.Client/MessageBoard/UI/CreateEntry.xaml b/Content.Client/MessageBoard/UI/CreateEntry.xaml new file mode 100644 index 00000000000..74562f318e1 --- /dev/null +++ b/Content.Client/MessageBoard/UI/CreateEntry.xaml @@ -0,0 +1,16 @@ + + + + + + + + + + + +