Skip to content

Commit

Permalink
CrystalThistle! (Simple-Station#1462)
Browse files Browse the repository at this point in the history
* Brings a glass producing plant to Botany

* Linter fix attempt 1

* Adresses adjustments requested by Reviewer

---------

Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
  • Loading branch information
jimmy12or authored and angelofallars committed Feb 1, 2025
1 parent c0af9b3 commit 6164a1a
Show file tree
Hide file tree
Showing 17 changed files with 147 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/reagents/meta/fun.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-Quartzite = Quartzite
reagent-desc-Quartzite = Millions of microscopic crystaline shards. Will cause internal bleeding, do not drink.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/seeds.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Seeds
seeds-CrystalThistle-name = CrystalThistle
seeds-CrystalThistle-display-name = CrystalThistle
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: entity
name: CrystalThistle
parent: FoodProduceBase
id: FoodCrystalThistle
description: A variant of galaxythistle that has sprouted sharp quartz shards.
components:
- type: FlavorProfile
flavors:
- sharp
- type: SolutionContainerManager
solutions:
food:
maxVol: 25
reagents:
- ReagentId: Quartzite
Quantity: 10
- ReagentId: Ethyloxyephedrine
Quantity: 15
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
- type: Produce
seedId: CrystalThistle
- type: Extractable
grindableSolutionName: food
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: SeedBase
name: packet of CrystalThistle seeds
description: "Like a bag of needles"
id: CrystalThistleSeeds
components:
- type: Seed
seedId: CrystalThistle
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
25 changes: 25 additions & 0 deletions Resources/Prototypes/DeltaV/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: seed
id: CrystalThistle
name: seeds-CrystalThistle-name
noun: seeds-noun-seeds
displayName: seeds-CrystalThistle-display-name
plantRsi: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
packetPrototype: CrystalThistleSeeds
productPrototypes:
- FoodCrystalThistle
lifespan: 25
maturation: 10
production: 3
yield: 3
potency: 10
growthStages: 3
waterConsumption: 0.60
chemicals:
Ethyloxyephedrine:
Min: 1
Max: 25
PotencyDivisor: 4
Quartzite:
Min: 1
Max: 25
PotencyDivisor: 4
38 changes: 38 additions & 0 deletions Resources/Prototypes/DeltaV/Reagents/fun.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
- type: reagent
id: Quartzite
name: reagent-name-Quartzite
group: Toxins
slippery: true
desc: reagent-desc-Quartzite
physicalDesc: reagent-physical-desc-reflective
flavor: sharp
color: "#ffffff"
reactiveEffects:
Acidic:
methods: [ Touch ]
effects:
- !type:HealthChange
scaleByQuantity: true
ignoreResistances: false
damage:
types:
Slash: 0.2
- !type:Emote
emote: Scream
probability: 0.7
metabolisms:
Poison:
metabolismRate : 3.00
effects:
- !type:HealthChange
damage:
types:
Slash : 3
- !type:PopupMessage
type: Local
visualType: LargeCaution
messages: [ "generic-reagent-effect-slicing-insides"]
probability: 0.33
- !type:Emote
emote: Scream
probability: 0.3
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Reactions/fun.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: reaction
id: GlassSheet # Creates 1 glass sheet from 10u Quartzite.
impact: Low
quantized: true
minTemp: 370
reactants:
Quartzite:
amount: 10
effects:
- !type:CreateEntityReactionEffect
entity: SheetGlass1
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@
- FoodGalaxythistle
- FoodFlyAmanita
- DeathNettle
- FoodCrystalThistle #Delta-V
rareChance: 0.01
2 changes: 1 addition & 1 deletion Resources/Prototypes/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@
productPrototypes:
- FoodGalaxythistle
mutationPrototypes:
- glasstle
- CrystalThistle #Delta-V
lifespan: 25
maturation: 10
production: 3
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Galaxy thistle Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a , Crystal Thistle edit made by Alchebun",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dead"
},
{
"name": "harvest"
},
{
"name": "produce"
},
{
"name": "seed"
},
{
"name": "stage-1"
},
{
"name": "stage-2"
},
{
"name": "stage-3"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6164a1a

Please sign in to comment.