Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
b8a270f
Linkable thrusters and gyro
Piggy3 Apr 7, 2026
fda8c7f
Update thrusters.yml
Piggy3 Apr 7, 2026
58b82f0
Update thrusters.yml
Piggy3 Apr 7, 2026
b7f4564
Intial addition of Goblin
CautionDev Apr 8, 2026
d916c14
fix: Phoron Alloy added Sheet tag for Anom Generator
Koollan Apr 20, 2026
2126bc3
Merge pull request #307 from Koollan/anomalygen-phoronfix
michaelchessall Apr 20, 2026
b3d41c2
change: Gas Mining Buff
Koollan Apr 20, 2026
82b676a
Merge pull request #308 from Koollan/gasmining-buff
michaelchessall Apr 21, 2026
3f67810
double cost and charge of painter ammo
Piggy3 Apr 21, 2026
cbff13a
fix smartfridge
michaelchessall Apr 21, 2026
41cc2fa
slow botany
michaelchessall Apr 21, 2026
b4c3ac8
Fix Grid Controller Board Prototype
Beridot Apr 22, 2026
96a1c0d
Merge pull request #310 from Beridot/persistence_testing
michaelchessall Apr 22, 2026
1750a37
The Second Half of the Crime Mechanics!
michaelchessall Apr 22, 2026
377c396
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 22, 2026
9f5a735
Add Precursor Guidebook
michaelchessall Apr 22, 2026
22a0b8b
Populate Precursor Purchases
michaelchessall Apr 22, 2026
e04c0ed
fix dupe ID
michaelchessall Apr 22, 2026
5b2001d
Merge pull request #309 from Piggy3/painter-ammo-change
michaelchessall Apr 22, 2026
925dac5
Merge pull request #291 from Piggy3/Making-thrusters-and-gyroscope-co…
michaelchessall Apr 22, 2026
10077ab
Revert "slow botany"
michaelchessall Apr 23, 2026
82c0a4b
Open Court gate fix
JoulesMango Apr 23, 2026
e23e03b
added localization for some of the bounties
Beridot Apr 24, 2026
b978211
Merge pull request #312 from Beridot/persistence_testing
michaelchessall Apr 24, 2026
03842b9
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 24, 2026
d95ddea
Merge pull request #311 from JoulesMango/court-fence-fix
michaelchessall Apr 24, 2026
113384b
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 24, 2026
57e3727
truly fix SOS signal
michaelchessall Apr 24, 2026
d4c80c0
Bounty Rebalance
michaelchessall Apr 25, 2026
85535e2
add telepad to autolathe
Beridot Apr 25, 2026
96002c3
Merge pull request #313 from Beridot/persistence_testing
michaelchessall Apr 25, 2026
dead8a5
balance botany
michaelchessall Apr 25, 2026
b682d4c
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 25, 2026
55eb1a6
remove antags from guidebook
michaelchessall Apr 25, 2026
223fd5c
Fix goblin height, add custom metabolism & ability to naturally pickp…
CautionDev Apr 25, 2026
51449d8
Fix goblin guidebook
CautionDev Apr 25, 2026
e2a2b44
Rebalance Goblin
CautionDev Apr 26, 2026
53b9729
Merge pull request #294 from CautionDev/persistence_testing
michaelchessall Apr 26, 2026
7ee8e12
make reagents exportable through crates
michaelchessall Apr 26, 2026
b8d1fee
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 26, 2026
c8a6db8
fix trivial bounty
michaelchessall Apr 26, 2026
a2331cd
fix error
michaelchessall Apr 26, 2026
0237d33
readjust bounty numbers
michaelchessall Apr 26, 2026
9d2eada
Stop saving bounty history
michaelchessall Apr 28, 2026
a389fcb
Add Welcome To The Threshold to lobby and jukebox
michaelchessall Apr 28, 2026
04113ff
nerf precursor export penalty
michaelchessall Apr 28, 2026
01f1385
remove engineeringmarket from the starterstation
michaelchessall Apr 28, 2026
861ac41
Fix Welded Doors.
michaelchessall Apr 28, 2026
68e0977
add personal cryopods
michaelchessall Apr 29, 2026
3a86f62
make precursor cooldowns longer
michaelchessall Apr 29, 2026
cc50f6d
Adds texture & animation for grid configurator
JoulesMango Apr 29, 2026
36ae26a
Merge pull request #316 from JoulesMango/grid-config2
michaelchessall Apr 29, 2026
7fcf67c
Merge branch 'master' into persistence_testing
michaelchessall Apr 29, 2026
c37c39e
Merge branch 'master' into persistence_testing
michaelchessall Apr 29, 2026
5e5b0a7
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 29, 2026
da55b2f
implement cryo icon
michaelchessall Apr 29, 2026
6ce6c11
make steelcap not provide steel
michaelchessall Apr 29, 2026
ac7cbd7
add secret phrase extractor to lathe
michaelchessall Apr 29, 2026
c10eecd
remove cocoa powder bounty
michaelchessall Apr 30, 2026
35ada6b
Update asteroids.yml
Koollan Apr 30, 2026
ba6e3e7
Added Access restrictions to R&D servers
michaelchessall Apr 30, 2026
5891c9f
Merge branch 'persistence_testing' of https://github.com/michaelchess…
michaelchessall Apr 30, 2026
2c751d2
Implement Further Out Now by mrjajkes as space ambience.
michaelchessall Apr 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Content.Client/Audio/Jukebox/JukeboxMenu.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<ui:FancyWindow xmlns="https://spacestation14.io" xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
SetSize="400 500" Title="{Loc 'jukebox-menu-title'}">
<BoxContainer Margin="4 0" Orientation="Vertical">
<ItemList Name="MusicList" SelectMode="Button" Margin="3 3 3 3"
HorizontalExpand="True" VerticalExpand="True" SizeFlagsStretchRatio="8"/>
<ScrollContainer MinHeight="350">
<ItemList Name="MusicList" SelectMode="Button" Margin="3 3 3 3"
HorizontalExpand="True" VerticalExpand="True" SizeFlagsStretchRatio="8"/>
</ScrollContainer>
<BoxContainer Orientation="Vertical">
<Label Name="SongSelected" Text="{Loc 'jukebox-menu-selectedsong'}" />
<Label Name="SongName" Text="---" />
Expand Down
7 changes: 5 additions & 2 deletions Content.Client/Cargo/UI/BountyEntry.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@
HorizontalExpand="True">
<BoxContainer Orientation="Horizontal">
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<RichTextLabel Name="RewardLabel"/>
<RichTextLabel Name="ManifestLabel"/>
<RichTextLabel Name="RewardLabel" Access="Public" />
<RichTextLabel Name="ManifestLabel" Access="Public"/>
<RichTextLabel Name="CriminalLabel" Access="Public" />
</BoxContainer>
<Control MinWidth="10"/>
<BoxContainer Orientation="Vertical" MinWidth="120">
<BoxContainer Orientation="Horizontal" MinWidth="120">
<Button Name="PrintButton"
Text="{Loc 'bounty-console-label-button-text'}"
Access="Public"
HorizontalExpand="False"
HorizontalAlignment="Right"/>
</BoxContainer>
Expand All @@ -40,6 +42,7 @@
</ProgressBar>
</BoxContainer>
</BoxContainer>

</BoxContainer>
</PanelContainer>
</BoxContainer>
1 change: 0 additions & 1 deletion Content.Client/Cargo/UI/CargoProductRow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Content.Client.Cargo.UI
public sealed partial class CargoProductRow : BoxContainer
{
public CargoProductPrototype? Product { get; set; }

public CargoProductRow()
{
RobustXamlLoader.Load(this);
Expand Down
10 changes: 10 additions & 0 deletions Content.Client/CrewAssignments/AdminUI/CodexEui.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Content.Shared.Fax;
using JetBrains.Annotations;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Map;

namespace Content.Client.CrewAssignments.AdminUI;

Expand All @@ -13,13 +14,21 @@ public sealed class CodexEui : BaseEui
{
private readonly CodexWindow _window;
private readonly CodexEditMenu _edit;
private string _sectorStatus = "";

public CodexEui()
{
_window = new CodexWindow(this);
_edit = new CodexEditMenu(this);
_window.OnClose += () => SendMessage(new CodexEuiMsg.Close());
_window.CreateButton.OnPressed += _ => OnCreate();
_window.SectorButton.OnPressed += _ => OnSectorButton();
}

private void OnSectorButton()
{
_edit.UpdateState(-1, "Sector Status", _sectorStatus, new List<String>(), true);
_edit.OpenCentered();
}

public override void Opened()
Expand Down Expand Up @@ -49,6 +58,7 @@ public override void HandleState(EuiStateBase state)
_edit.UpdateState(entry.ID, entry.Title, entry.Description, entry.Whitelist, entry.Visible);
}
}
_sectorStatus = cast.SectorStatus;

}

Expand Down
1 change: 1 addition & 0 deletions Content.Client/CrewAssignments/AdminUI/CodexWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
<BoxContainer Orientation="Vertical" Access="Public">
<Button Name="CreateButton" Text="Create New Entry" Access="Public"></Button>
<Button Name="SectorButton" Text="Edit Sector Status" Access="Public"></Button>
<BoxContainer Orientation="Vertical" Access="Public" Name="CodexContainer">

</BoxContainer>
Expand Down
3 changes: 2 additions & 1 deletion Content.Client/CrewAssignments/Systems/JobNetSystem.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Content.Shared.CrewAssignments.Components;
using Content.Shared.CrewAssignments.Systems;
using Content.Shared.DoAfter;
using Content.Shared.Precursor;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using System;
using System.Collections.Generic;
using System.Text;
Expand All @@ -10,5 +12,4 @@ namespace Content.Client.CrewAssignments.Systems;

public sealed class JobNetSystem : SharedJobNetSystem
{

}
35 changes: 34 additions & 1 deletion Content.Client/CrewAssignments/UI/JobNetBoundUserInterface.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
using Content.Client.CrewAssignments.UI;
using Content.Client.UserInterface.Systems.Guidebook;
using Content.Shared.Cargo.Components;
using Content.Shared.CrewAssignments;
using Content.Shared.CrewAssignments.Components;
using Content.Shared.Store;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.BaseButton;
Expand All @@ -28,16 +31,46 @@ public JobNetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey
protected override void Open()
{
base.Open();

var spriteSystem = EntMan.System<SpriteSystem>();
_menu = this.CreateWindow<JobNetMenu>();
_menu.Owner = this;
_menu._spriteSystem = spriteSystem;
_menu.PossibleJobs.OnItemSelected += OnJobPressed;
_menu.LevelPurchaseButton.OnPressed += OnLevelPurchase;
_menu.DealerSelect.OnPressed += DealerSelect_OnPressed;
_menu.AssassinSelect.OnPressed += AssassinSelect_OnPressed;
_menu.BountyHSelect.OnPressed += BountyHSelect_OnPressed;
_menu.HuntedLEB.OnPressed += HuntedLEB_OnPressed;
_menu.HuntLEB.OnPressed += HuntLEB_OnPressed;
_menu.OnItemSelected += (row) =>
{
if (row == null || row.Product == null)
return;

SendMessage(new JobNetPurchasePrecursorMessage(row.Product.ID));
};
_menu.OnLabelButtonPressed += id =>
{
SendMessage(new JobNetDealerLabelMessage(id));
};
CodexMenu = new();
_menu.PrecursorGuidebook.OnPressed += (ButtonEventArgs obj) =>
{
var guidebookController = _menu.UserInterfaceManager.GetUIController<GuidebookUIController>();
guidebookController.OpenGuidebook(selected: "Precursor");
};
}

private void HuntLEB_OnPressed(ButtonEventArgs obj)
{
if (_menu == null) return;
SendMessage(new JobNetSubmitHuntMessage(_menu.HuntLE.Text));
}

private void HuntedLEB_OnPressed(ButtonEventArgs obj)
{
if (_menu == null) return;
SendMessage(new JobNetSubmitHuntedMessage(_menu.HuntedLE.Text));
}

private void BountyHSelect_OnPressed(ButtonEventArgs obj)
Expand Down
41 changes: 33 additions & 8 deletions Content.Client/CrewAssignments/UI/JobNetMenu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,25 @@
<Label Text="ZENITH SECTOR" Margin="0 0 10 0"
StyleClasses="LabelKeyText" />
</BoxContainer>
<Control MinHeight="40" />
<BoxContainer Orientation="Horizontal">
<Label Text="Sector Development:" Margin="0 0 10 0"
StyleClasses="LabelKeyText" />
<Label Name="SectorDevelopmentLabel" Text="10" Margin="0 0 10 0" />
</BoxContainer>
<Control MinHeight="20" />
<BoxContainer Orientation="Horizontal">
<Label Text="Sector Chaos:" Margin="0 0 10 0"
StyleClasses="LabelKeyText" />
<Label Name="SectorChaosLabel" Text="100/1500" Margin="0 0 10 0" />
</BoxContainer>
<Control MinHeight="20" />
<BoxContainer Orientation="Horizontal">
<Label Text="Sector Status:" Margin="0 0 10 0"
StyleClasses="LabelKeyText" />
</BoxContainer>
<PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True" MinHeight="30" Margin="10 10 10 0">
<BoxContainer Orientation="Vertical">
</BoxContainer>
<PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True" MinHeight="120" Margin="10 10 10 0">
<RichTextLabel Name="SectorStatusLabel" />
</PanelContainer>
</BoxContainer>

Expand Down Expand Up @@ -172,6 +174,8 @@
StyleClasses="LabelKeyText" />
<Label Text="Civillian"
Name="PLevelText" />
<Control HorizontalExpand="True" />
<Button Name="PrecursorGuidebook" Text="Guide" Access="Public" />
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<ProgressBar Name="PLevelBar"
Expand Down Expand Up @@ -223,7 +227,7 @@
PlaceHolder="Secret Passphrase"
Access="Public"
HorizontalExpand="True" />
<Button Name="HuntedLEB" Text="Submit" />
<Button Access="Public" Name="HuntedLEB" Text="Submit" />
</BoxContainer>

<Label Access="Public" Text="Reward: 500 Precursor" />
Expand All @@ -233,19 +237,21 @@
<BoxContainer
HorizontalExpand="True"
Orientation="Vertical">
<Label Access="Public" Text="Hunt Faurns Goldberg and enter their Secret Passphrase." />
<Label Name="HuntDescLabel" Access="Public" Text="Hunt Faurns Goldberg and enter their Secret Passphrase." />
<BoxContainer Orientation="Horizontal">
<LineEdit Name="HuntLE"
PlaceHolder="Secret Passphrase"
Access="Public"
HorizontalExpand="True" />
<Button Name="HuntLEB" Text="Submit" />
<Button Access="Public" Name="HuntLEB" Text="Submit" />
</BoxContainer>
<Label Access="Public" Text="Reward: 500 Precursor" />
<Label Access="Public" Text="Sector chaos will increase" />
</BoxContainer>
</PanelContainer>

<BoxContainer Name="DealerObjectives" Orientation="Vertical">

</BoxContainer>
</BoxContainer>
</BoxContainer>
</BoxContainer>
Expand Down Expand Up @@ -299,7 +305,26 @@
StyleClasses="LabelKeyText" />
</BoxContainer>
<BoxContainer Orientation="Vertical" Name="PurchasesContent">

<Label Text="Rank 2:"
StyleClasses="LabelKeyText" />
<BoxContainer Orientation="Vertical" Name="Rank2Content">

</BoxContainer>
<Label Text="Rank 3:"
StyleClasses="LabelKeyText" />
<BoxContainer Orientation="Vertical" Name="Rank3Content">

</BoxContainer>
<Label Text="Rank 4:"
StyleClasses="LabelKeyText" />
<BoxContainer Orientation="Vertical" Name="Rank4Content">

</BoxContainer>
<Label Text="Rank 5:"
StyleClasses="LabelKeyText" />
<BoxContainer Orientation="Vertical" Name="Rank5Content">

</BoxContainer>
</BoxContainer>
</BoxContainer>

Expand Down
Loading
Loading