From 83f7d3f3df6315374ba19193feeef7bce8f4e84c Mon Sep 17 00:00:00 2001 From: Tr1bute Date: Mon, 4 Nov 2024 01:56:41 +0100 Subject: [PATCH] Added Popup for the Ligneous plant mutation when using hands. (#33136) * Added Popup for the Ligneous plant mutation when using hands. There was some confusion for players with the Ligneous mutation which makes the plant harvestable only with sharp tools. Adding a popup with the message "The plant is too tough." to give them a hint to use something other than just their hands. I decided to only put the message when attempting to harvest using hands, as the intent is clear that the player just wanted to harvest, but wasn't able to. Using any other tools like a crowbar or a screwdriver will not trigger the popup. * Update Resources/Locale/en-US/botany/components/plant-holder-component.ftl Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> --------- Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> --- Content.Server/Botany/Systems/PlantHolderSystem.cs | 3 +++ .../Locale/en-US/botany/components/plant-holder-component.ftl | 1 + 2 files changed, 4 insertions(+) diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 34d6a75bf2..271acb606a 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -680,7 +680,10 @@ public sealed class PlantHolderSystem : EntitySystem if (TryComp(user, out var hands)) { if (!_botany.CanHarvest(component.Seed, hands.ActiveHandEntity)) + { + _popup.PopupCursor(Loc.GetString("plant-holder-component-ligneous-cant-harvest-message"), user); return false; + } } else if (!_botany.CanHarvest(component.Seed)) { diff --git a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl index ca20c277f5..0f416455c7 100644 --- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl +++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl @@ -31,3 +31,4 @@ plant-holder-component-heat-improper-warning = The [color=orange]improper temper plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking. plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking. plant-holder-component-early-sample-message = The plant hasn't grown enough to take a sample yet. +plant-holder-component-ligneous-cant-harvest-message = The plant is too tough to harvest with your bare hands.