Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-29 21:03:23 +12:00
committed by GitHub
parent 9c8ffb4575
commit 3e2ffcc02d
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Botany/Systems/BotanySystem.Produce.cs
View File

@@ -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();

7
Content.Server/Botany/Systems/BotanySystem.Seed.cs
View File

@@ -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));