diff --git a/Content.Server/_CD/Engraving/EngraveableComponent.cs b/Content.Server/_CD/Engraving/EngraveableComponent.cs index f60ee3f584..57ad871360 100644 --- a/Content.Server/_CD/Engraving/EngraveableComponent.cs +++ b/Content.Server/_CD/Engraving/EngraveableComponent.cs @@ -16,17 +16,17 @@ public sealed partial class EngraveableComponent : Component /// The inspect text to use when there is no engraving /// [DataField] - public LocId NoEngravingText = "engraving-dogtags-no-message"; + public LocId NoEngravingText = "engraving-no-message"; //DeltaV - Engravable rings /// /// The message to use when successfully engraving the item /// [DataField] - public LocId EngraveSuccessMessage = "engraving-dogtags-succeed"; + public LocId EngraveSuccessMessage = "engraving-succeed"; //DeltaV - Engravable rings /// /// The inspect text to use when there is an engraving. The message will be shown seperately afterwards. /// [DataField] - public LocId HasEngravingText = "engraving-dogtags-has-message"; + public LocId HasEngravingText = "engraving-has-message"; //DeltaV - Engravable rings } diff --git a/Content.Server/_CD/Engraving/EngraveableSystem.cs b/Content.Server/_CD/Engraving/EngraveableSystem.cs index 370929511a..c63da713f4 100644 --- a/Content.Server/_CD/Engraving/EngraveableSystem.cs +++ b/Content.Server/_CD/Engraving/EngraveableSystem.cs @@ -29,7 +29,8 @@ public sealed class EngraveableSystem : EntitySystem var msg = new FormattedMessage(); msg.AddMarkupOrThrow(Loc.GetString(ent.Comp.EngravedMessage == string.Empty ? ent.Comp.NoEngravingText - : ent.Comp.HasEngravingText)); + : ent.Comp.HasEngravingText, + ("item", ent.Owner))); //DeltaV - Engravable rings if (ent.Comp.EngravedMessage != string.Empty) msg.AddMarkupPermissive(Loc.GetString(ent.Comp.EngravedMessage)); @@ -66,7 +67,7 @@ public sealed class EngraveableSystem : EntitySystem return; ent.Comp.EngravedMessage = message; - _popup.PopupEntity(Loc.GetString(ent.Comp.EngraveSuccessMessage), + _popup.PopupEntity(Loc.GetString(ent.Comp.EngraveSuccessMessage, ("item", ent.Owner)), //DeltaV - Engravable rings actor.PlayerSession.AttachedEntity.Value, actor.PlayerSession, PopupType.Medium); diff --git a/Resources/Locale/en-US/_CD/engraving/engraving.ftl b/Resources/Locale/en-US/_CD/engraving/engraving.ftl deleted file mode 100644 index fc6ca919ea..0000000000 --- a/Resources/Locale/en-US/_CD/engraving/engraving.ftl +++ /dev/null @@ -1,6 +0,0 @@ -engraving-verb-engrave = Engrave -engraving-popup-ui-message = Description - -engraving-dogtags-no-message = The dogtags don't seem to have any kind of engraving. -engraving-dogtags-has-message = The dogtags are engraved with a message that reads:{" "} -engraving-dogtags-succeed = You successfully engrave the dogtags with your message. diff --git a/Resources/Locale/en-US/_DV/engraving/engraving.ftl b/Resources/Locale/en-US/_DV/engraving/engraving.ftl new file mode 100644 index 0000000000..de91a864fc --- /dev/null +++ b/Resources/Locale/en-US/_DV/engraving/engraving.ftl @@ -0,0 +1,6 @@ +engraving-verb-engrave = Engrave +engraving-popup-ui-message = Description + +engraving-no-message = No engraving is present on {THE($item)}. +engraving-has-message = An engraving on {THE($item)} reads:{" "} +engraving-succeed = You successfully engrave {THE($item)} with your message. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index cd68149edc..22b211e592 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -72,6 +72,7 @@ - type: Tag tags: - Ring + - type: Engraveable # DeltaV - type: entity abstract: true