diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 1073a53069..b1f4ba9713 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -16,8 +16,8 @@ amount: 2 - id: CannabisSeeds amount: 2 -# - id: NettleSeeds -# amount: 2 + - id: NettleSeeds + amount: 2 # - id: RainbowBunchSeeds # amount: 2 # - id: StrangeSeeds diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 538049024d..503ba2497e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -102,6 +102,37 @@ seed: towercap - type: Log +- type: entity + name: nettle + description: Stingy little prick. + id: Nettle + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/nettle.rsi + - type: Item + size: 10 + sprite: Objects/Specific/Hydroponics/nettle.rsi + prefix: inhand + - type: MeleeWeapon + damage: + types: + Heat: 10 + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Histamine + Quantity: 25 + - type: Produce + seed: nettle + - type: MeleeChemicalInjector + transferAmount: 6 #To OD someone you would need 2 nettles and about 6-7 hits, the DOT is likely to crit them if they are running away with almost no health + - type: Extractable + grindableSolutionName: food + - type: InjectableSolution + solution: food + - type: entity name: banana parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 2efe6a83b4..4d8ad1d51b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -181,3 +181,14 @@ seed: cannabis - type: Sprite sprite: Objects/Specific/Hydroponics/cannabis.rsi + +- type: entity + parent: SeedBase + name: packet of nettle seeds + description: "Handle with gloves." + id: NettleSeeds + components: + - type: Seed + seed: nettle + - type: Sprite + sprite: Objects/Specific/Hydroponics/nettle.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 6a748b5dbf..02d9b2c056 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -424,3 +424,26 @@ Min: 1 Max: 10 PotencyDivisor: 10 + +- type: seed + id: nettle + name: nettle + seedName: nettle + displayName: nettles + plantRsi: Objects/Specific/Hydroponics/nettle.rsi + productPrototypes: + - Nettle + lifespan: 25 + maturation: 8 + production: 6 + yield: 3 + potency: 20 + growthStages: 5 + idealLight: 8 + waterConsumption: 6 + idealHeat: 298 + chemicals: + Histamine: + Min: 1 + Max: 25 + PotencyDivisor: 4 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/dead.png new file mode 100644 index 0000000000..f9d49d6a6f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/harvest.png new file mode 100644 index 0000000000..701cd8868f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-left.png new file mode 100644 index 0000000000..d6a98c8cf2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-right.png new file mode 100644 index 0000000000..bd346bdfed Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json new file mode 100644 index 0000000000..361c777a97 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png new file mode 100644 index 0000000000..3b50100cd0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/seed.png new file mode 100644 index 0000000000..3c2e747b7c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-1.png new file mode 100644 index 0000000000..b8306090d6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-2.png new file mode 100644 index 0000000000..55be8ad7c0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-3.png new file mode 100644 index 0000000000..6100f87490 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-4.png new file mode 100644 index 0000000000..fb65b55b36 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-5.png new file mode 100644 index 0000000000..c6e8070331 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/stage-5.png differ