diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index ba6c2f4e3c..6e56c7320a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -715,3 +715,25 @@ seed: flyAmanita - type: Extractable grindableSolutionName: food + +- type: entity + name: gatfruit + parent: FoodProduceBase + id: FoodGatfruit + description: A delicious, gun-shaped fruit with a thick wooden stem. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sulfur + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/gatfruit.rsi + - type: Produce + seed: gatfruit + - type: Food + trash: RevolverPredator diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 43538038cd..09b9478453 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -269,3 +269,14 @@ seed: flyAmanita - type: Sprite sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + +- type: entity + parent: SeedBase + name: packet of gatfruit seeds + description: "These are no peashooters." + id: GatfruitSeeds + components: + - type: Seed + seed: gatfruit + - type: Sprite + sprite: Objects/Specific/Hydroponics/gatfruit.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index c4a5dd6645..fe41bbc8bb 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -623,3 +623,29 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: gatfruit + name: gatfruit + seedName: gatfruit + displayName: gatfruit tree + plantRsi: Objects/Specific/Hydroponics/gatfruit.rsi + productPrototypes: + - FoodGatfruit + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 2 + potency: 10 + growthStages: 2 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Sulfur: + Min: 1 + Max: 5 + PotencyDivisor: 20 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/dead.png new file mode 100644 index 0000000000..d367f019cc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/harvest.png new file mode 100644 index 0000000000..99bbfd2eba Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json new file mode 100644 index 0000000000..72b9a92f7e --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce.png new file mode 100644 index 0000000000..df0d63e384 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/seed.png new file mode 100644 index 0000000000..76fb9fad1f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-1.png new file mode 100644 index 0000000000..7b7a145aac Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-2.png new file mode 100644 index 0000000000..e1a595e72c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/stage-2.png differ