]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Spaceman's Trumpet and Lily (#25090)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Wed, 21 Feb 2024 06:49:39 +0000 (16:49 +1000)
committerGitHub <noreply@github.com>
Wed, 21 Feb 2024 06:49:39 +0000 (23:49 -0700)
* trumpet + lily +polypy

* trumbet

25 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/medicine.ftl
Resources/Locale/en-US/seeds/seeds.ftl
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Reagents/medicine.yml
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png [new file with mode: 0644]

index 3ff86e38752f2e845229304af5d0b7eee9fa899b..f2bbd60bed4f586ae52f84416c6e30af77af963c 100644 (file)
@@ -167,6 +167,7 @@ flavor-complex-lost-friendship = like lost friendship
 flavor-complex-light = like a light gone out
 flavor-complex-profits = like profits
 flavor-complex-fishops = like the dreaded fishops
+flavor-complex-violets = like violets
 
 # Drink-specific flavors.
 
index e208b9a8e40eb6de767a3032c708b4c272025d53..e02d428082faea3b42bd90a0409ed3e8052ee68a 100644 (file)
@@ -52,6 +52,9 @@ reagent-desc-barozine = A potent chemical that prevents pressure damage. Causes
 reagent-name-phalanximine = phalanximine
 reagent-desc-phalanximine = An advanced chemical used in the treatment of cancer. Causes moderate radiation poisoning on organics and vomiting. Can potentially remove the death gene on plants.
 
+reagent-name-polypyrylium-oligomers = Polypyrylium Oligomers
+reagent-desc-polypyrylium-oligomers = A purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. Heals asphyxiation and brute damage. Stops bleeding over time.
+
 reagent-name-ambuzol = ambuzol
 reagent-desc-ambuzol = A highly engineered substance able to halt the progression of a zombie infection.
 
index dca67fa04c4b2b3c10beb4844b025f33a4a71cb0..b39837828830d28b321b6618059d54984535e703 100644 (file)
@@ -73,6 +73,8 @@ seeds-aloe-name = aloe
 seeds-aloe-display-name = aloe
 seeds-laughin-pea-name = laughin' peas
 seeds-laughin-pea-display-name = laughin' peas
+seeds-lily-name = lily
+seeds-lily-display-name = lily
 seeds-lingzhi-name = lingzhi
 seeds-lingzhi-display-name = lingzhi
 seeds-ambrosiavulgaris-name = ambrosia vulgaris
@@ -89,6 +91,8 @@ seeds-rice-name = rice
 seeds-rice-display-name = rice stalks
 seeds-soybeans-name = soybeans
 seeds-soybeans-display-name = soy plant
+seeds-spacemans-trumpet-name = spaceman's trumpet
+seeds-spacemans-trumpet-display-name = spaceman's trumpet plant
 seeds-koibean-name = koibeans
 seeds-koibean-display-name = koibean plant
 seeds-watermelon-name = watermelon
index 7c6e86010894983a2dd9e794496827d66d46d846..fd2fddb8a0e348a5e43ebbc45d4b47c064271526 100644 (file)
     tags:
     - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
 
+- type: entity
+  name: lily
+  parent: FoodPoppy
+  id: FoodLily
+  description: A beautiful orange flower.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - medicine
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 22
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Bicaridine
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/lily.rsi
+  - type: Produce
+    seedId: lily
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Flower
+
 - type: entity
   name: lingzhi
   parent: FoodProduceBase
       - ReagentId: MilkSoy
         Quantity: 5
 
+- type: entity
+  name: spaceman's trumpet
+  description: A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon.
+  id: FoodSpacemansTrumpet
+  parent: FoodProduceBase
+  components:
+  - type: FlavorProfile
+    flavors:
+      - violets
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 4
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1
+        - ReagentId: PolypyryliumOligomers
+          Quantity: 3
+  - type: Produce
+    seedId: spacemansTrumpet
+  - type: Tag
+    tags:
+    - Flower
+  - type: Instrument #hehe trumpet
+    program: 56
+
 - type: entity
   name: koibean
   description: These beans seem a little bit fishy.
index affdc79defa7fb030bcf8ee62f2ff05c596e52e4..2b232d643d37c2d83c9477f812909c0752248996 100644 (file)
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/poppy.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of lily seeds
+  description: "These seeds grow into lilies."
+  id: LilySeeds
+  components:
+    - type: Seed
+      seedId: lily
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/lily.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lingzhi spores
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/soybeans.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of spaceman's trumpet seeds
+  id: SpacemansTrumpetSeeds
+  components:
+    - type: Seed
+      seedId: spacemansTrumpet
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of koibean seeds
index e08d73e834f380f1ae9454e6a469ceac5ffda2f2..9015d0a6bd73fd3e7175eb202e72882f74106def 100644 (file)
   id: fishops
   flavorType: Complex
   description: flavor-complex-fishops
+
+- type: flavor
+  id: violets
+  flavorType: Complex
+  description: flavor-complex-violets
index 649ffa85224a7ce1a7fcc3fe9218ce92053e93d2..c46531fce75e3855616d6f1ccfded574cbf38c73 100644 (file)
   packetPrototype: PoppySeeds
   productPrototypes:
     - FoodPoppy
+  mutationPrototypes:
+    - lily
   lifespan: 25
   maturation: 10
   production: 3
       Max: 10
       PotencyDivisor: 10
 
+- type: seed
+  id: lily
+  name: seeds-lily-name
+  noun: seeds-noun-seeds
+  displayName: seeds-lily-display-name
+  plantRsi: Objects/Specific/Hydroponics/lily.rsi
+  packetPrototype: LilySeeds
+  productPrototypes:
+    - FoodLily
+  mutationPrototypes:
+    - spacemansTrumpet
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 2
+      Potencydivisor: 50
+    Bicaridine:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 5
+
 - type: seed
   id: lingzhi
   name: seeds-lingzhi-name
       Max: 2
       PotencyDivisor: 50
 
+- type: seed
+  id: spacemansTrumpet
+  name: seeds-spacemans-trumpet-name
+  noun: seeds-noun-seeds
+  displayName: seeds-spacemans-trumpet-display-name
+  plantRsi: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  packetPrototype: SpacemansTrumpetSeeds
+  productPrototypes:
+    - FoodSpacemansTrumpet
+  growthStages: 4
+  lifespan: 20
+  maturation: 14
+  production: 3
+  yield: 2
+  potency: 10
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      Potencydivisor: 50
+    PolypyryliumOligomers:
+      Min: 1
+      Max: 15
+      PotencyDivisor: 5
+
 - type: seed
   id: koibean
   name: seeds-koibean-name
index 7a807db70bbec01223a2dda45372942b71215967..66875401285c165ee0024e4dc3a9673ddd90e03c 100644 (file)
       - !type:ChemVomit
         probability: 0.05
 
+- type: reagent
+  id: PolypyryliumOligomers
+  name: reagent-name-polypyrylium-oligomers
+  group: Medicine
+  desc: reagent-desc-polypyrylium-oligomers
+  physicalDesc: reagent-physical-desc-pungent
+  flavor: violets
+  color: "#9423FF"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Brute: -3.5
+          types:
+            Asphyxiation: -2.5
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 30
+        damage:
+          types:
+            Asphyxiation: 3.5
+      - !type:ModifyBleedAmount
+        amount: -0.25
+
 - type: reagent
   id: Ambuzol
   name: reagent-name-ambuzol
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png
new file mode 100644 (file)
index 0000000..849b424
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png
new file mode 100644 (file)
index 0000000..750707d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
new file mode 100644 (file)
index 0000000..ddbda4f
--- /dev/null
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
new file mode 100644 (file)
index 0000000..aa83786
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png
new file mode 100644 (file)
index 0000000..2399c2e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..1e582f9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..090715f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..edcd861
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png
new file mode 100644 (file)
index 0000000..5106219
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png
new file mode 100644 (file)
index 0000000..4674a6e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json
new file mode 100644 (file)
index 0000000..97d9a92
--- /dev/null
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png
new file mode 100644 (file)
index 0000000..fc1e13c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png
new file mode 100644 (file)
index 0000000..86bf711
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..65648ac
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..f52a395
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..f92f971
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png
new file mode 100644 (file)
index 0000000..3810662
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png differ