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

Add knife butchering and blood gibbing (#6770)

Browse Source
This commit is contained in:
mirrorcult
2022-02-18 15:57:42 -07:00
committed by GitHub
parent 67661ddbdb
commit 676ca21b5f
28 changed files with 223 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Botany/Components/PlantHolderComponent.cs
View File

@@ -7,6 +7,7 @@ using Content.Server.Chemistry.EntitySystems;
using Content.Server.Chemistry.Components;
using Content.Server.Fluids.Components;
using Content.Server.Hands.Components;
using Content.Server.Kitchen.Components;
using Content.Server.Plants;
using Content.Server.Popups;
using Content.Shared.ActionBlocker;
@@ -802,9 +803,10 @@ namespace Content.Server.Botany.Components
return true;
}
if (tagSystem.HasTag(usingItem, "BotanySharp"))
if (_entMan.HasComponent<SharpComponent>(usingItem))
{
return DoHarvest(user);
}
if (_entMan.TryGetComponent<ProduceComponent?>(usingItem, out var produce))

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

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using Content.Server.Botany.Components;
using Content.Server.Kitchen.Components;
using Content.Shared.Examine;
using Content.Shared.Random.Helpers;
using Content.Shared.Tag;
@@ -136,7 +137,7 @@ public sealed partial class BotanySystem
public bool CanHarvest(SeedPrototype proto, EntityUid? held = null)
{
return !proto.Ligneous || proto.Ligneous && held != null && _tags.HasTag(held.Value, "BotanySharp");
return !proto.Ligneous || proto.Ligneous && held != null && HasComp<SharpComponent>(held);
}
#endregion

5
Content.Server/Botany/Systems/LogSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Botany.Components;
using Content.Server.Kitchen.Components;
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction;
using Content.Shared.Random.Helpers;
@@ -9,8 +10,6 @@ namespace Content.Server.Botany.Systems;
public sealed class LogSystem : EntitySystem
{
[Dependency] private readonly TagSystem _tags = default!;
public override void Initialize()
{
base.Initialize();
@@ -20,7 +19,7 @@ public sealed class LogSystem : EntitySystem
private void OnInteractUsing(EntityUid uid, LogComponent component, InteractUsingEvent args)
{
if (_tags.HasTag(args.Used, "BotanySharp"))
if (HasComp<SharpComponent>(args.Used))
{
for (var i = 0; i < component.SpawnCount; i++)
{