diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index 96d8ca86b5..d98acb0759 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -1,5 +1,6 @@ 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; @@ -88,6 +89,13 @@ public sealed class InjectorSystem : SharedInjectorSystem if (args.Target is not { Valid: true } target || !HasComp(entity)) return; + + //CP14 - Shitcode retarget plant -> soil + //TODO: fix it + if (TryComp(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(target) || HasComp(target)) { diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml index 5b9f4af05a..3c7347c80e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml @@ -24,11 +24,14 @@ 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 @@ -50,6 +53,9 @@ 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" ] @@ -61,3 +67,7 @@ - type: Construction graph: CP14Seedbed node: CP14SeedbedWooden + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: liq- + solutionName: soil diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png new file mode 100644 index 0000000000..d8e7d86a66 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png new file mode 100644 index 0000000000..84037c9c80 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png new file mode 100644 index 0000000000..1011d52dab Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png new file mode 100644 index 0000000000..4df37911cf Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json index eca3993994..09b8676bd1 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Farming/seedbed.rsi/meta.json @@ -21,6 +21,18 @@ }, { "name": "seedbed_default_south" + }, + { + "name": "liq-1" + }, + { + "name": "liq-2" + }, + { + "name": "liq-3" + }, + { + "name": "liq-4" } ] } diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-1.png deleted file mode 100644 index 866669947f..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-2.png deleted file mode 100644 index 8ef3440ed8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-3.png deleted file mode 100644 index c49454b976..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-4.png deleted file mode 100644 index 6d9e10a71e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/liq-4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json deleted file mode 100644 index 74df594902..0000000000 --- a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil1.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil1.png deleted file mode 100644 index 67eb9b052e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil2.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil2.png deleted file mode 100644 index 735fc692aa..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil3.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil3.png deleted file mode 100644 index c4a342ff3b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil4.png b/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil4.png deleted file mode 100644 index 6e4e368879..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Farming/soil.rsi/soil4.png and /dev/null differ