forked from space-wizards/space-station-14
-
-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'hivehum/spelf-to-thaven' into publish-t…
…o-staging
- Loading branch information
Showing
305 changed files
with
3,261 additions
and
3,261 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
41 changes: 0 additions & 41 deletions
41
Content.Client/_Impstation/Spelfs/SpelfMoodsBoundUserInterface.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
...pstation/Spelfs/Eui/MoodContainer.xaml.cs → ...pstation/Thaven/Eui/MoodContainer.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
using Content.Shared._Impstation.Spelfs; | ||
using Content.Shared._Impstation.Thaven; | ||
using Robust.Client.AutoGenerated; | ||
using Robust.Client.UserInterface.Controls; | ||
using Robust.Client.UserInterface.XAML; | ||
using Robust.Shared.Utility; | ||
|
||
namespace Content.Client._Impstation.Spelfs.Eui; | ||
namespace Content.Client._Impstation.Thaven.Eui; | ||
|
||
[GenerateTypedNameReferences] | ||
public sealed partial class MoodContainer : BoxContainer | ||
{ | ||
public MoodContainer(SpelfMood? mood = null) | ||
public MoodContainer(ThavenMood? mood = null) | ||
{ | ||
RobustXamlLoader.Load(this); | ||
|
||
if (mood != null) | ||
{ | ||
SpelfMoodTitle.Text = mood.GetLocName(); | ||
SpelfMoodContent.TextRope = new Rope.Leaf(mood.GetLocDesc()); | ||
ThavenMoodTitle.Text = mood.GetLocName(); | ||
ThavenMoodContent.TextRope = new Rope.Leaf(mood.GetLocDesc()); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
using Content.Client.Eui; | ||
using Content.Shared.Eui; | ||
using Content.Shared._Impstation.Thaven; | ||
|
||
namespace Content.Client._Impstation.Thaven.Eui; | ||
|
||
public sealed class ThavenMoodsEui : BaseEui | ||
{ | ||
private readonly EntityManager _entityManager; | ||
|
||
private ThavenMoodUi _thavenMoodUi; | ||
private NetEntity _target; | ||
|
||
public ThavenMoodsEui() | ||
{ | ||
_entityManager = IoCManager.Resolve<EntityManager>(); | ||
|
||
_thavenMoodUi = new ThavenMoodUi(); | ||
_thavenMoodUi.SaveButton.OnPressed += _ => SaveMoods(); | ||
} | ||
|
||
private void SaveMoods() | ||
{ | ||
var newMoods = _thavenMoodUi.GetMoods(); | ||
SendMessage(new ThavenMoodsSaveMessage(newMoods, _target)); | ||
_thavenMoodUi.SetMoods(newMoods); | ||
} | ||
|
||
public override void Opened() | ||
{ | ||
_thavenMoodUi.OpenCentered(); | ||
} | ||
|
||
public override void HandleState(EuiStateBase state) | ||
{ | ||
if (state is not ThavenMoodsEuiState s) | ||
return; | ||
|
||
_target = s.Target; | ||
_thavenMoodUi.SetMoods(s.Moods); | ||
} | ||
} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
using Content.Shared._Impstation.Thaven; | ||
|
||
namespace Content.Client._Impstation.Thaven; | ||
|
||
public sealed partial class ThavenMoodSystem : SharedThavenMoodSystem | ||
{ | ||
} |
41 changes: 41 additions & 0 deletions
41
Content.Client/_Impstation/Thaven/ThavenMoodsBoundUserInterface.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
using Content.Client._Impstation.Thaven; | ||
using Content.Shared._Impstation.Thaven; | ||
using Content.Shared._Impstation.Thaven.Components; | ||
using JetBrains.Annotations; | ||
using Robust.Client.UserInterface; | ||
|
||
namespace Content.Client._Impstation.Thaven; | ||
|
||
[UsedImplicitly] | ||
public sealed class ThavenMoodsBoundUserInterface : BoundUserInterface | ||
{ | ||
[ViewVariables] | ||
private ThavenMoodsMenu? _menu; | ||
private EntityUid _owner; | ||
private List<ThavenMood>? _moods; | ||
private List<ThavenMood>? _sharedMoods; | ||
|
||
public ThavenMoodsBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) | ||
{ | ||
_owner = owner; | ||
} | ||
|
||
protected override void Open() | ||
{ | ||
base.Open(); | ||
|
||
_menu = this.CreateWindow<ThavenMoodsMenu>(); | ||
} | ||
|
||
protected override void UpdateState(BoundUserInterfaceState state) | ||
{ | ||
base.UpdateState(state); | ||
|
||
if (state is not ThavenMoodsBuiState msg) | ||
return; | ||
|
||
_moods = msg.Moods; | ||
_sharedMoods = msg.SharedMoods; | ||
_menu?.Update(_owner, msg); | ||
} | ||
} |
File renamed without changes.
10 changes: 5 additions & 5 deletions
10
..._Impstation/Spelfs/SpelfMoodsMenu.xaml.cs → ...Impstation/Thaven/ThavenMoodsMenu.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.