Revert "fix soil"

This reverts commit 8176355286.
This commit is contained in:
Ed
2024-09-18 15:27:09 +03:00
parent 8176355286
commit 0c958f4c9c
16 changed files with 36 additions and 31 deletions

View File

@@ -1,6 +1,5 @@
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Shared._CP14.Farming;
using Content.Shared._CP14.Skills;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Components;
@@ -89,13 +88,6 @@ public sealed class InjectorSystem : SharedInjectorSystem
if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
return;
//CP14 - Shitcode retarget plant -> soil
//TODO: fix it
if (TryComp<CP14PlantComponent>(args.Target, out var plant) && plant.SoilUid is not null)
target = plant.SoilUid.Value;
//CP14 - end shitcode
// Is the target a mob? If yes, use a do-after to give them time to respond.
if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
{

View File

@@ -24,14 +24,11 @@
solutions:
soil:
maxVol: 200
- type: RefillableSolution
- type: RefillableSolution
solution: soil
maxRefill: 50
- type: ExaminableSolution
solution: soil
- type: Transform
anchored: true
noRot: true
- type: CP14Soil
solution: soil
@@ -53,9 +50,6 @@
sprite: _CP14/Structures/Specific/Farming/seedbed.rsi
layers:
- state: seedbed_default
- state: liq-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- map: [ "enum.EdgeLayer.South" ]
state: seedbed_default_south
- map: [ "enum.EdgeLayer.East" ]
@@ -67,7 +61,3 @@
- type: Construction
graph: CP14Seedbed
node: CP14SeedbedWooden
- type: SolutionContainerVisuals
maxFillLevels: 4
fillBaseName: liq-
solutionName: soil

Binary file not shown.

Before

Width:  |  Height:  |  Size: 600 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 852 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 940 B

View File

@@ -21,18 +21,6 @@
},
{
"name": "seedbed_default_south"
},
{
"name": "liq-1"
},
{
"name": "liq-2"
},
{
"name": "liq-3"
},
{
"name": "liq-4"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 632 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1,35 @@
{
"version": 1,
"license": "CLA",
"copyright": "Created by TheShuEd for CrystallPunk14",
"size": {
"x": 48,
"y": 48
},
"states": [
{
"name": "liq-1"
},
{
"name": "liq-2"
},
{
"name": "liq-3"
},
{
"name": "liq-4"
},
{
"name": "soil1"
},
{
"name": "soil2"
},
{
"name": "soil3"
},
{
"name": "soil4"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 743 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 757 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B