Content update for UI prediction (#27214)
* Content update for UI refactor * Big update * Sharing * Remaining content updates * First big update * Prototype updates * AUGH * Fix UI comp ref * Cleanup - Fix predicted message, fix item slots, fix interaction range check. * Fix regressions * Make this predictive idk why it wasn't. * Fix slime merge * Merge conflict * Fix merge
This commit is contained in:
@@ -32,8 +32,8 @@ public sealed partial class HumanoidAppearanceSystem
|
||||
Icon = new SpriteSpecifier.Rsi(new("/Textures/Mobs/Customization/reptilian_parts.rsi"), "tail_smooth"),
|
||||
Act = () =>
|
||||
{
|
||||
_uiSystem.TryOpen(uid, HumanoidMarkingModifierKey.Key, actor.PlayerSession);
|
||||
_uiSystem.TrySetUiState(
|
||||
_uiSystem.OpenUi(uid, HumanoidMarkingModifierKey.Key, actor.PlayerSession);
|
||||
_uiSystem.SetUiState(
|
||||
uid,
|
||||
HumanoidMarkingModifierKey.Key,
|
||||
new HumanoidMarkingModifierState(component.MarkingSet, component.Species,
|
||||
@@ -48,8 +48,7 @@ public sealed partial class HumanoidAppearanceSystem
|
||||
private void OnBaseLayersSet(EntityUid uid, HumanoidAppearanceComponent component,
|
||||
HumanoidMarkingModifierBaseLayersSetMessage message)
|
||||
{
|
||||
if (message.Session is not { } player
|
||||
|| !_adminManager.HasAdminFlag(player, AdminFlags.Fun))
|
||||
if (!_adminManager.HasAdminFlag(message.Actor, AdminFlags.Fun))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -67,7 +66,7 @@ public sealed partial class HumanoidAppearanceSystem
|
||||
|
||||
if (message.ResendState)
|
||||
{
|
||||
_uiSystem.TrySetUiState(
|
||||
_uiSystem.SetUiState(
|
||||
uid,
|
||||
HumanoidMarkingModifierKey.Key,
|
||||
new HumanoidMarkingModifierState(component.MarkingSet, component.Species,
|
||||
@@ -81,8 +80,7 @@ public sealed partial class HumanoidAppearanceSystem
|
||||
private void OnMarkingsSet(EntityUid uid, HumanoidAppearanceComponent component,
|
||||
HumanoidMarkingModifierMarkingSetMessage message)
|
||||
{
|
||||
if (message.Session is not { } player
|
||||
|| !_adminManager.HasAdminFlag(player, AdminFlags.Fun))
|
||||
if (!_adminManager.HasAdminFlag(message.Actor, AdminFlags.Fun))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -92,7 +90,7 @@ public sealed partial class HumanoidAppearanceSystem
|
||||
|
||||
if (message.ResendState)
|
||||
{
|
||||
_uiSystem.TrySetUiState(
|
||||
_uiSystem.SetUiState(
|
||||
uid,
|
||||
HumanoidMarkingModifierKey.Key,
|
||||
new HumanoidMarkingModifierState(component.MarkingSet, component.Species,
|
||||
|
||||
Reference in New Issue
Block a user