Remove server-side sprite references from botany system (#15886)

diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
index 552b60a3fb7dd011ddc8f308b4745d92131ac8af..3cfb21f3c46e7206cdc1ce2a6db963084608279a 100644 (file)
--- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
@@ -11,12 +11,6 @@ public sealed partial class BotanySystem
         if (!TryGetSeed(produce, out var seed))
             return;
 
-        if (TryComp(uid, out SpriteComponent? sprite))
-        {
-            sprite.LayerSetRSI(0, seed.PlantRsi);
-            sprite.LayerSetState(0, seed.PlantIconState);
-        }
-
         var solutionContainer = _solutionContainerSystem.EnsureSolution(uid, produce.SolutionName);
 
         solutionContainer.RemoveAllSolution();

diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index 2cbe17aff19581f905b11f0bb4b03ae4d056e9fd..da8f5bfc6adb2b1cc9c1e5a434c48e00bd3e57ed 100644 (file)
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -99,13 +99,6 @@ public sealed partial class BotanySystem : EntitySystem
         var seedComp = EnsureComp<SeedComponent>(seed);
         seedComp.Seed = proto;
 
-        if (TryComp(seed, out SpriteComponent? sprite))
-        {
-            // TODO visualizer
-            // SeedPrototype state will always be seed. Blame the spriter if that's not the case!
-            sprite.LayerSetSprite(0, new SpriteSpecifier.Rsi(proto.PlantRsi, "seed"));
-        }
-
         var name = Loc.GetString(proto.Name);
         var noun = Loc.GetString(proto.Noun);
         var val = Loc.GetString("botany-seed-packet-name", ("seedName", name), ("seedNoun", noun));

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 6f60018f80472b0a9a90b9e96048b30ed81d8d8a..d64f908a8db9ebbd7d16ad9942633cac88eb8e2c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -1,13 +1,12 @@
 - type: entity
   parent: BaseItem
   id: SeedBase
-  noSpawn: true
+  abstract: true
   components:
     - type: SolutionContainerManager
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/seeds.rsi
       state: seed
-      netsync: true
     - type: Item
       size: 2
     - type: StaticPrice

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index eaf3c75898ee84f1faedb8828dad5de4dc7d0bee..e6562cde46005835c909e7268f07613055386530 100644 (file)
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -4,6 +4,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-wheat-display-name
   plantRsi: Objects/Specific/Hydroponics/wheat.rsi
+  packetPrototype: WheatSeeds
   productPrototypes:
     - WheatBushel
   lifespan: 25
@@ -29,6 +30,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-oat-display-name
   plantRsi: Objects/Specific/Hydroponics/oat.rsi
+  packetPrototype: OatSeeds
   productPrototypes:
     - OatBushel
   lifespan: 25
@@ -54,6 +56,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-banana-display-name
   plantRsi: Objects/Specific/Hydroponics/banana.rsi
+  packetPrototype: BananaSeeds
   productPrototypes:
     - FoodBanana
   harvestRepeat: Repeat
@@ -80,6 +83,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-carrots-display-name
   plantRsi: Objects/Specific/Hydroponics/carrot.rsi
+  packetPrototype: CarrotSeeds
   productPrototypes:
     - FoodCarrot
   lifespan: 25
@@ -105,6 +109,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-lemon-display-name
   plantRsi: Objects/Specific/Hydroponics/lemon.rsi
+  packetPrototype: LemonSeeds
   productPrototypes:
     - FoodLemon
   harvestRepeat: Repeat
@@ -130,6 +135,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-lime-display-name
   plantRsi: Objects/Specific/Hydroponics/lime.rsi
+  packetPrototype: LimeSeeds
   productPrototypes:
     - FoodLime
   harvestRepeat: Repeat
@@ -155,6 +161,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-orange-display-name
   plantRsi: Objects/Specific/Hydroponics/orange.rsi
+  packetPrototype: OrangeSeeds
   productPrototypes:
     - FoodOrange
   harvestRepeat: Repeat
@@ -180,6 +187,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-pineapple-display-name
   plantRsi: Objects/Specific/Hydroponics/pineapple.rsi
+  packetPrototype: PineappleSeeds
   productPrototypes:
     - FoodPineapple
   harvestRepeat: Repeat
@@ -210,6 +218,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-potato-display-name
   plantRsi: Objects/Specific/Hydroponics/potato.rsi
+  packetPrototype: PotatoSeeds
   productPrototypes:
     - FoodPotato
   lifespan: 30
@@ -235,6 +244,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-sugarcane-display-name
   plantRsi: Objects/Specific/Hydroponics/sugarcane.rsi
+  packetPrototype: SugarcaneSeeds
   productPrototypes:
     - Sugarcane
   harvestRepeat: Repeat
@@ -257,6 +267,7 @@
   noun: seeds-noun-spores
   displayName: seeds-towercap-display-name
   plantRsi: Objects/Specific/Hydroponics/towercap.rsi
+  packetPrototype: TowercapSeeds
   productPrototypes:
     - Log
   lifespan: 80
@@ -276,6 +287,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-tomato-display-name
   plantRsi: Objects/Specific/Hydroponics/tomato.rsi
+  packetPrototype: TomatoSeeds
   productPrototypes:
     - FoodTomato
   harvestRepeat: Repeat
@@ -306,6 +318,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-eggplant-display-name
   plantRsi: Objects/Specific/Hydroponics/eggplant.rsi
+  packetPrototype: EggplantSeeds
   productPrototypes:
     - FoodEggplant
   harvestRepeat: Repeat
@@ -332,6 +345,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-cabbage-display-name
   plantRsi: Objects/Specific/Hydroponics/cabbage.rsi
+  packetPrototype: CabbageSeeds
   productPrototypes:
     - FoodCabbage
   lifespan: 50
@@ -356,6 +370,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-garlic-display-name
   plantRsi: Objects/Specific/Hydroponics/garlic.rsi
+  packetPrototype: GarlicSeeds
   productPrototypes:
     - FoodGarlic
   lifespan: 25
@@ -384,6 +399,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-apple-display-name
   plantRsi: Objects/Specific/Hydroponics/apple.rsi
+  packetPrototype: AppleSeeds
   productPrototypes:
     - FoodApple
   harvestRepeat: Repeat
@@ -409,6 +425,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-corn-display-name
   plantRsi: Objects/Specific/Hydroponics/corn.rsi
+  packetPrototype: CornSeeds
   productPrototypes:
     - FoodCorn
   lifespan: 25
@@ -436,6 +453,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-onion-display-name
   plantRsi: Objects/Specific/Hydroponics/onion.rsi
+  packetPrototype: OnionSeeds
   productPrototypes:
     - FoodOnion
   lifespan: 25
@@ -467,6 +485,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-onionred-display-name
   plantRsi: Objects/Specific/Hydroponics/onion_red.rsi
+  packetPrototype: OnionRedSeeds
   productPrototypes:
     - FoodOnionRed
   lifespan: 25
@@ -498,6 +517,7 @@
   noun: seeds-noun-spores
   displayName: seeds-chanterelle-display-name
   plantRsi: Objects/Specific/Hydroponics/chanterelle.rsi
+  packetPrototype: ChanterelleSeeds
   productPrototypes:
     - FoodMushroom
   lifespan: 35
@@ -521,6 +541,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-eggy-display-name
   plantRsi: Objects/Specific/Hydroponics/eggy.rsi
+  packetPrototype: EggySeeds
   productPrototypes:
     - FoodEgg
   harvestRepeat: Repeat
@@ -543,6 +564,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-cannabis-display-name
   plantRsi: Objects/Specific/Hydroponics/cannabis.rsi
+  packetPrototype: CannabisSeeds
   productPrototypes:
     - LeavesCannabis
   harvestRepeat: Repeat
@@ -566,6 +588,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-tobacco-display-name
   plantRsi: Objects/Specific/Hydroponics/tobacco.rsi
+  packetPrototype: TobaccoSeeds
   productPrototypes:
     - LeavesTobacco
   harvestRepeat: Repeat
@@ -589,6 +612,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-nettle-display-name
   plantRsi: Objects/Specific/Hydroponics/nettle.rsi
+  packetPrototype: NettleSeeds
   productPrototypes:
     - Nettle
   lifespan: 25
@@ -612,6 +636,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-chili-display-name
   plantRsi: Objects/Specific/Hydroponics/chili.rsi
+  packetPrototype: ChiliSeeds
   productPrototypes:
     - FoodChili
   harvestRepeat: Repeat
@@ -642,6 +667,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-poppy-display-name
   plantRsi: Objects/Specific/Hydroponics/poppy.rsi
+  packetPrototype: PoppySeeds
   productPrototypes:
     - FoodPoppy
   lifespan: 25
@@ -667,6 +693,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-aloe-display-name
   plantRsi: Objects/Specific/Hydroponics/aloe.rsi
+  packetPrototype: AloeSeeds
   productPrototypes:
     - FoodAloe
   lifespan: 25
@@ -692,6 +719,7 @@
   noun: seeds-noun-spores
   displayName: seeds-lingzhi-display-name
   plantRsi: Objects/Specific/Hydroponics/lingzhi.rsi
+  packetPrototype: LingzhiSeeds
   productPrototypes:
     - FoodLingzhi
   lifespan: 25
@@ -717,6 +745,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-ambrosiavulgaris-display-name
   plantRsi: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
+  packetPrototype: AmbrosiaVulgarisSeeds
   productPrototypes:
     - FoodAmbrosiaVulgaris
   lifespan: 25
@@ -754,6 +783,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-galaxythistle-display-name
   plantRsi: Objects/Specific/Hydroponics/galaxythistle.rsi
+  packetPrototype: GalaxythistleSeeds
   productPrototypes:
     - FoodGalaxythistle
   lifespan: 25
@@ -775,6 +805,7 @@
   noun: seeds-noun-spores
   displayName: seeds-flyamanita-display-name
   plantRsi: Objects/Specific/Hydroponics/fly_amanita.rsi
+  packetPrototype: FlyAmanitaSeeds
   productPrototypes:
     - FoodFlyAmanita
   lifespan: 25
@@ -800,6 +831,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-gatfruit-display-name
   plantRsi: Objects/Specific/Hydroponics/gatfruit.rsi
+  packetPrototype: GatfruitSeeds
   productPrototypes:
     - FoodGatfruit
   lifespan: 65
@@ -825,6 +857,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-rice-display-name
   plantRsi: Objects/Specific/Hydroponics/rice.rsi
+  packetPrototype: RiceSeeds
   productPrototypes:
     - RiceBushel
   lifespan: 25
@@ -851,6 +884,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-soybeans-display-name
   plantRsi: Objects/Specific/Hydroponics/soybeans.rsi
+  packetPrototype: SoybeanSeeds
   productPrototypes:
     - FoodSoybeans
   growthStages: 4
@@ -873,6 +907,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-grape-display-name
   plantRsi: Objects/Specific/Hydroponics/grape.rsi
+  packetPrototype: GrapeSeeds
   productPrototypes:
     - FoodGrape
   lifespan: 50
@@ -897,6 +932,7 @@
   noun: seeds-noun-seeds
   displayName: seeds-watermelon-display-name
   plantRsi: Objects/Specific/Hydroponics/watermelon.rsi
+  packetPrototype: WatermelonSeeds
   productPrototypes:
     - FoodWatermelon
   lifespan: 55