Require plants to be harvestable before sampling (#24851)

diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 6bf0b9692ced63da4e017b4f0c1077a29109b3ae..601dca36856e6fa14c34c1a75bc44d3a05ba67a4 100644 (file)
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -262,13 +262,20 @@ public sealed class PlantHolderSystem : EntitySystem
                 return;
             }
 
+            component.Health -= (_random.Next(3, 5) * 10);
+
+            if (!component.Harvest)
+            {
+                _popup.PopupCursor(Loc.GetString("plant-holder-component-early-sample"), args.User);
+                return;
+            }
+
             component.Seed.Unique = false;
             var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User);
             _randomHelper.RandomOffset(seed, 0.25f);
             var displayName = Loc.GetString(component.Seed.DisplayName);
             _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
                 ("seedName", displayName)), args.User);
-            component.Health -= (_random.Next(3, 5) * 10);
 
             if (component.Seed != null && component.Seed.CanScream)
             {

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 1e7dbe689ccdf37531d698a54ccebbea8318d1db..01d713ab34e435e9a6e43a4ede9c23c70470ab21 100644 (file)
--- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
@@ -32,3 +32,4 @@ plant-holder-component-light-improper-warning = The [color=yellow]improper light
 plant-holder-component-heat-improper-warning = The [color=orange]improper temperature level alert[/color] is blinking.
 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 = It is not ready to sample, but you cut a bit of the plant anyway.