From 5d0b86c6590dbde8ebe989dbd94ea7cfce0f5cb9 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 8 Jul 2020 02:53:50 +0200
Subject: [PATCH] Hide transfer verbs when right clicking reagent container in
 active hand.

Fixes #1313
---
 .../GameObjects/Components/Chemistry/SolutionComponent.cs       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
index 4a4dcbabef..5c5f2fd230 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -224,6 +224,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
                 if (!ActionBlockerSystem.CanInteract(user) ||
                     !user.TryGetComponent<HandsComponent>(out var hands) ||
                     hands.GetActiveHand == null ||
+                    hands.GetActiveHand.Owner == component.Owner ||
                     !hands.GetActiveHand.Owner.TryGetComponent<SolutionComponent>(out var solution))
                 {
                     data.Visibility = VerbVisibility.Invisible;
@@ -323,6 +324,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
                 if (!ActionBlockerSystem.CanInteract(user) ||
                     !user.TryGetComponent<HandsComponent>(out var hands) ||
                     hands.GetActiveHand == null ||
+                    hands.GetActiveHand.Owner == component.Owner ||
                     !hands.GetActiveHand.Owner.TryGetComponent<SolutionComponent>(out var solution))
                 {
                     data.Visibility = VerbVisibility.Invisible;