From 36514f4bbd154b0d8fac8dfee2dbd95cc3d64b92 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 1 Oct 2021 13:37:43 +0200 Subject: [PATCH] Fix hand examine showing virtual items. --- Content.Server/Hands/Systems/HandsSystem.cs | 3 +++ Resources/Changelog/Changelog.yml | 2 +- Resources/Changelog/Parts/hands.yml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Resources/Changelog/Parts/hands.yml diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index 23dfbb8779..002e1766b2 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -183,6 +183,9 @@ namespace Content.Server.Hands.Systems { foreach (var inhand in component.GetAllHeldItems()) { + if (inhand.Owner.HasComponent()) + continue; + args.PushText(Loc.GetString("comp-hands-examine", ("user", component.Owner), ("item", inhand.Owner))); } } diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 97ac3e0abf..e079591e07 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2129,7 +2129,7 @@ Entries: - {message: Fixes drinking glasses not breaking when thrown., type: Fix} id: 380 time: '2021-10-01T10:29:58.505975+00:00' -- author: Your_Name_Here +- author: Zumorica changes: - {message: Fix mob inventory strip window showing virtual items it shouldn't., type: Fix} diff --git a/Resources/Changelog/Parts/hands.yml b/Resources/Changelog/Parts/hands.yml new file mode 100644 index 0000000000..f3fed53dbb --- /dev/null +++ b/Resources/Changelog/Parts/hands.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Fix # One of the following: Add, Remove, Tweak, Fix + message: Fix hands examine text showing virtual items it shouldn't.