Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

radial menu fixes, heretic ftl fix, thaven emagging fix #3

Merged
merged 2 commits into from
Feb 10, 2025
Merged

radial menu fixes, heretic ftl fix, thaven emagging fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2804d41
radial menu fixes, heretic ftl fix, thaven emagging fix
Darkmajia Feb 10, 2025
e23911b
Merge branch 'dev' into upstream-1626-fixes
formlessnameless Feb 10, 2025
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
3 changes: 1 addition & 2 deletions Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ public ShortConstructionMenu(EntityUid owner, ShortConstructionMenuBUI bui, Cons
if (!_protoManager.TryIndex(protoId, out var proto))
continue;

var button = new RadialMenuTextureButton
var button = new RadialMenuTextureButtonWithSector
{
ToolTip = Loc.GetString(proto.Name),
StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(48f, 48f)
};

Expand Down
3 changes: 1 addition & 2 deletions Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public CardHandMenu(EntityUid owner, CardHandMenuBoundUserInterface bui)

var button = new CardMenuButton()
{
StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64f, 64f),
ToolTip = cardName,
};
Expand Down Expand Up @@ -92,7 +91,7 @@ public CardHandMenu(EntityUid owner, CardHandMenuBoundUserInterface bui)
}
}

public sealed class CardMenuButton : RadialMenuTextureButton
public sealed class CardMenuButton : RadialMenuTextureButtonWithSector
{
public CardMenuButton()
{
Expand Down
3 changes: 1 addition & 2 deletions Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ private void RefreshUI()

var button = new HereticRitualMenuButton
{
StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64, 64),
ToolTip = Loc.GetString(ritualPrototype.LocName),
ProtoId = ritualPrototype.ID
Expand Down Expand Up @@ -94,7 +93,7 @@ private void AddHereticRitualMenuButtonOnClickAction(RadialContainer mainControl
}
}

public sealed class HereticRitualMenuButton : RadialMenuTextureButton
public sealed class HereticRitualMenuButton : RadialMenuTextureButtonWithSector
{
public ProtoId<HereticRitualPrototype> ProtoId { get; set; }
}
Expand Down
3 changes: 1 addition & 2 deletions Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ private void UpdateUI()

var button = new EmbeddedEntityMenuButton
{
StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64, 64),
ToolTip = _ent.TryGetComponent<MetaDataComponent>(ent.Value, out var md) ? md.EntityName : "Unknown",
NetEntity = (NetEntity) target,
Expand Down Expand Up @@ -90,7 +89,7 @@ private void AddAction(RadialContainer main)
}
}

public sealed class EmbeddedEntityMenuButton : RadialMenuTextureButton
public sealed class EmbeddedEntityMenuButton : RadialMenuTextureButtonWithSector
{
public NetEntity NetEntity;
}
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_Goobstation/Heretic/heretic/rituals.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ heretic-ritual-noritual = No ritual chosen!
heretic-ritual-basic-sacrifice = Heartbeat of the Mansus
heretic-ritual-basic-focus = Amber Focus
heretic-ritual-basic-heart = Relentless Heartbeat
heretic-ritual-basic-codex = Codex Cicatrix

heretic-ritual-fail-sacrifice = There is no corpse to sacrifice.
heretic-ritual-fail-sacrifice-ineligible = The rune refuses to accept this sacrifice.
Expand Down