diff --git a/Content.Server/Storage/EntitySystems/SecretStashSystem.cs b/Content.Server/Storage/EntitySystems/SecretStashSystem.cs index dee1d0ffb3..81e8bd431e 100644 --- a/Content.Server/Storage/EntitySystems/SecretStashSystem.cs +++ b/Content.Server/Storage/EntitySystems/SecretStashSystem.cs @@ -47,11 +47,11 @@ namespace Content.Server.Storage.EntitySystems /// True if item was hidden inside stash public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid, SecretStashComponent? component = null, ItemComponent? item = null, - MetaDataComponent? itemMeta = null, HandsComponent? hands = null) + HandsComponent? hands = null) { if (!Resolve(uid, ref component)) return false; - if (!Resolve(itemToHideUid, ref item, ref itemMeta)) + if (!Resolve(itemToHideUid, ref item)) return false; if (!Resolve(userUid, ref hands)) return false; @@ -66,11 +66,10 @@ namespace Content.Server.Storage.EntitySystems } // check if item is too big to fit into secret stash - var itemName = itemMeta.EntityName; if (item.Size > component.MaxItemSize) { var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big", - ("item", itemName), ("stash", GetSecretPartName(uid, component))); + ("item", itemToHideUid), ("stash", GetSecretPartName(uid, component))); _popupSystem.PopupEntity(msg, uid, userUid); return false; } @@ -83,7 +82,7 @@ namespace Content.Server.Storage.EntitySystems // all done, show success message var successMsg = Loc.GetString("comp-secret-stash-action-hide-success", - ("item", itemName), ("this", GetSecretPartName(uid, component))); + ("item", itemToHideUid), ("this", GetSecretPartName(uid, component))); _popupSystem.PopupEntity(successMsg, uid, userUid); return true; } @@ -123,8 +122,7 @@ namespace Content.Server.Storage.EntitySystems if (stash.SecretPartName != "") return Loc.GetString(stash.SecretPartName); - var meta = EntityManager.GetComponent(uid); - var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("name", meta.EntityName)); + var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid)); return entityName; } diff --git a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl index 1d3fe38c69..d41933b374 100644 --- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl +++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl @@ -1,10 +1,10 @@ ### Secret stash component. Stuff like potted plants, comfy chair cushions, etc... -comp-secret-stash-secret-part-name = {$name} -comp-secret-stash-action-hide-success = You hide {$item} in { $this } +comp-secret-stash-secret-part-name = { THE($item) } +comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this } comp-secret-stash-action-hide-container-not-empty = There's already something in here?! -comp-secret-stash-action-hide-item-too-big = {$item} is too big to fit in {$stash}! +comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}! comp-secret-stash-action-get-item-found-something = There was something inside {$stash}! secret-stash-part-plant = the plant -secret-stash-part-toilet = the toilet cistern \ No newline at end of file +secret-stash-part-toilet = the toilet cistern