Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2 New peppers! Ghost and Cosmic Revenant! #1542

Merged
merged 10 commits into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/seeds.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Seeds
seeds-CrystalThistle-name = CrystalThistle
seeds-CrystalThistle-display-name = CrystalThistle
seeds-GhostPepper-name = Ghost Pepper
seeds-GhostPepper-display-name = Ghost Pepper
seeds-CosmicRevenant-name = Cosmic Revenant
seeds-CosmicRevenant-display-name = Cosmic Revenant Pepper
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,69 @@
seedId: CrystalThistle
- type: Extractable
grindableSolutionName: food

- type: entity
name: Ghost Pepper
parent: FoodProduceBase
id: FoodGhostPepper
description: So hot, you'll have one foot in the grave.
components:
- type: FlavorProfile
flavors:
- spicy
- sweet
- type: SolutionContainerManager
solutions:
food:
maxVol: 39
reagents:
- ReagentId: Nutriment
Quantity: 6
- ReagentId: CapsaicinOil
Quantity: 15
- ReagentId: Vitamin
Quantity: 6
- ReagentId: Thermite
Quantity: 10
- type: TileFrictionModifier
modifier: 0.05
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi
- type: Produce
seedId: GhostPepper
- type: Tag
tags:
- Vegetable

- type: entity
name: Cosmic Revenant
parent: FoodProduceBase
id: FoodCosmicRevenant
description: Is this even a pepper? Looks... Haunted.
components:
- type: FlavorProfile
flavors:
- spicy
- spooky
- type: SolutionContainerManager
solutions:
food:
maxVol: 41
reagents:
- ReagentId: Nutriment
Quantity: 8
- ReagentId: CapsaicinOil
Quantity: 20
- ReagentId: Vitamin
Quantity: 8
- ReagentId: Ectoplasm
Quantity: 5
- type: TileFrictionModifier
modifier: 0.0001
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
- type: Produce
seedId: CosmicRevenant
- type: Tag
tags:
- Vegetable
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,25 @@
seedId: CrystalThistle
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi

- type: entity
parent: SeedBase
name: packet of Ghost Pepper seeds
description: "Be sure to plant these six feet under."
id: GhostPepperSeeds
components:
- type: Seed
seedId: GhostPepper
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi

- type: entity
parent: SeedBase
name: packet of Cosmic Revenant Pepper seeds
description: "Harvest dark spirits for the good of the station."
id: CosmicRevenantSeeds
components:
- type: Seed
seedId: CosmicRevenant
- type: Sprite
sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
72 changes: 72 additions & 0 deletions Resources/Prototypes/DeltaV/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,75 @@
Min: 1
Max: 25
PotencyDivisor: 4

- type: seed
id: GhostPepper
name: seeds-GhostPepper-name
noun: seeds-noun-seeds
displayName: seeds-GhostPepper-display-name
plantRsi: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi
packetPrototype: GhostPepperSeeds
productPrototypes:
- FoodGhostPepper
mutationPrototypes:
- CosmicRevenant
harvestRepeat: Repeat
lifespan: 25
maturation: 6
production: 6
yield: 2
potency: 20
idealLight: 9
idealHeat: 298
chemicals:
CapsaicinOil:
Min: 2
Max: 20
PotencyDivisor: 10
Nutriment:
Min: 2
Max: 8
PotencyDivisor: 25
Vitamin:
Min: 2
Max: 8
PotencyDivisor: 25
Thermite:
Min: 5
Max: 20
PotencyDivisor: 10

- type: seed
id: CosmicRevenant
name: seeds-CosmicRevenant-name
noun: seeds-noun-seeds
displayName: seeds-CosmicRevenant-display-name
plantRsi: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
packetPrototype: CosmicRevenantSeeds
productPrototypes:
- FoodCosmicRevenant
harvestRepeat: Repeat
lifespan: 25
maturation: 6
production: 6
yield: 2
potency: 20
idealLight: 9
idealHeat: 298
chemicals:
CapsaicinOil:
Min: 3
Max: 30
PotencyDivisor: 10
Nutriment:
Min: 4
Max: 10
PotencyDivisor: 25
Vitamin:
Min: 4
Max: 10
PotencyDivisor: 25
Ectoplasm:
Min: 1
Max: 5
PotencyDivisor: 10
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@
- FoodFlyAmanita
- DeathNettle
- FoodCrystalThistle #Delta-V
- FoodGhostPepper #Delta-V
- FoodCosmicRevenant #Delta-V
rareChance: 0.01
1 change: 1 addition & 0 deletions Resources/Prototypes/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,7 @@
- FoodChiliPepper
mutationPrototypes:
- chilly
- GhostPepper #Delta-V
harvestRepeat: Repeat
lifespan: 25
maturation: 6
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,87 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13, edited by Alchebun",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dead",
"delays":
[
[
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "harvest",
"delays":
[
[
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08
]
]
},
{
"name": "produce",
"delays":
[
[
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08
]
]
},
{
"name": "seed"
},
{
"name": "stage-1"
},
{
"name": "stage-2"
},
{
"name": "stage-3"
},
{
"name": "stage-4"
},
{
"name": "stage-5"
},
{
"name": "stage-6"
}
]
}
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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13",
"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"
},
{
"name": "stage-5"
},
{
"name": "stage-6"
}
]
}
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.
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.
2 changes: 1 addition & 1 deletion RobustToolbox
jimmy12or marked this conversation as resolved.
Show resolved Hide resolved
Submodule RobustToolbox updated 84 files
+3 −3 Directory.Packages.props
+1 −1 MSBuild/Robust.Engine.Version.props
+0 −92 RELEASE-NOTES.md
+3 −3 Resources/Locale/en-US/commands.ftl
+1 −2 Robust.Benchmarks/Configs/DefaultSQLConfig.cs
+2 −4 Robust.Benchmarks/Exporters/SQLExporter.cs
+2 −2 Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs
+8 −14 Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs
+4 −4 Robust.Client/GameStates/ClientGameStateManager.cs
+1 −1 Robust.Client/Graphics/Overlays/Overlay.cs
+2 −2 Robust.Client/ResourceManagement/ResourceCache.Preload.cs
+22 −30 Robust.Client/ResourceManagement/ResourceCache.cs
+0 −9 Robust.Client/UserInterface/Control.cs
+0 −7 Robust.Client/UserInterface/Controls/ContainerButton.cs
+9 −27 Robust.Client/UserInterface/Controls/OutputPanel.cs
+2 −2 Robust.Client/UserInterface/Controls/RichTextLabel.cs
+0 −13 Robust.Client/UserInterface/Controls/TabContainer.cs
+0 −6 Robust.Client/UserInterface/Controls/WindowRoot.cs
+0 −20 Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.cs
+17 −18 Robust.Client/UserInterface/RichTextEntry.cs
+2 −21 Robust.Client/UserInterface/UserInterfaceManager.Scaling.cs
+0 −2 Robust.Client/UserInterface/UserInterfaceManager.cs
+1 −1 Robust.LoaderApi
+0 −12 Robust.Server/GameStates/PvsData.cs
+3 −3 Robust.Server/GameStates/PvsSystem.Dirty.cs
+16 −5 Robust.Server/GameStates/PvsSystem.Leave.cs
+0 −85 Robust.Server/GameStates/PvsSystem.Send.cs
+0 −73 Robust.Server/GameStates/PvsSystem.Serialize.cs
+46 −1 Robust.Server/GameStates/PvsSystem.Session.cs
+57 −32 Robust.Server/GameStates/PvsSystem.cs
+1 −0 Robust.Server/Player/PlayerManager.cs
+2 −0 Robust.Server/Program.cs
+1 −1 Robust.Server/ServerHub/HubManager.cs
+2 −2 Robust.Server/ServerStatus/StatusHost.Acz.cs
+4 −3 Robust.Server/ServerStatus/StatusHost.Handlers.cs
+1 −1 Robust.Shared.CompNetworkGenerator/ComponentNetworkGenerator.cs
+1 −1 Robust.Shared/Analyzers/ComponentNetworkGeneratorAuxiliary.cs
+2 −8 Robust.Shared/CVars.cs
+0 −304 Robust.Shared/Collections/RingBufferList.cs
+1 −1 Robust.Shared/Console/Commands/DumpEventTablesCommand.cs
+6 −1 Robust.Shared/Console/Commands/TeleportCommands.cs
+10 −28 Robust.Shared/Console/CompletionHelper.cs
+10 −10 Robust.Shared/Containers/SharedContainerSystem.Insert.cs
+7 −7 Robust.Shared/Containers/SharedContainerSystem.Remove.cs
+0 −442 Robust.Shared/ContentPack/AssemblyTypeChecker.ReportBadReferences.cs
+24 −37 Robust.Shared/ContentPack/AssemblyTypeChecker.cs
+1 −2 Robust.Shared/ContentPack/Sandbox.yml
+24 −7 Robust.Shared/GameObjects/CompIdx.cs
+2 −5 Robust.Shared/GameObjects/ComponentEventArgs.cs
+4 −28 Robust.Shared/GameObjects/ComponentFactory.cs
+9 −18 Robust.Shared/GameObjects/Entity.cs
+158 −135 Robust.Shared/GameObjects/EntityEventBus.Directed.cs
+0 −3 Robust.Shared/GameObjects/EntityEventBus.Ordering.cs
+46 −67 Robust.Shared/GameObjects/EntityManager.Components.cs
+10 −10 Robust.Shared/GameObjects/EntityManager.LifeCycle.cs
+0 −3 Robust.Shared/GameObjects/EntityManager.Systems.cs
+1 −1 Robust.Shared/GameObjects/EntityManager.cs
+1 −9 Robust.Shared/GameObjects/EntitySystem.Proxy.cs
+0 −7 Robust.Shared/GameObjects/EntitySystemMessages/EntityRenamedEvent.cs
+0 −12 Robust.Shared/GameObjects/IComponentFactory.cs
+2 −2 Robust.Shared/GameObjects/IEntityManager.Components.cs
+0 −3 Robust.Shared/GameObjects/IEntityManager.Systems.cs
+1 −1 Robust.Shared/GameObjects/NetEntity.cs
+4 −45 Robust.Shared/GameObjects/Systems/EntityLookupSystem.ComponentQueries.cs
+1 −8 Robust.Shared/GameObjects/Systems/MetaDataSystem.cs
+1 −1 Robust.Shared/Graphics/Eye.cs
+0 −6 Robust.Shared/Localization/LocalizationManager.Functions.cs
+55 −208 Robust.Shared/Network/HappyEyeballsHttp.cs
+5 −4 Robust.Shared/Network/Messages/MsgPlayerList.cs
+30 −20 Robust.Shared/Network/Messages/MsgState.cs
+64 −79 Robust.Shared/Physics/Systems/SharedBroadphaseSystem.cs
+0 −26 Robust.Shared/Player/ActorSystem.cs
+8 −11 Robust.Shared/Prototypes/IPrototypeManager.cs
+2 −2 Robust.Shared/Prototypes/PrototypeManager.Categories.cs
+8 −18 Robust.Shared/Prototypes/PrototypeManager.cs
+0 −7 Robust.Shared/Random/RandomExtensions.cs
+1 −2 Robust.Shared/Toolshed/Commands/Values/EntCommand.cs
+2 −5 Robust.Shared/Toolshed/TypeParsers/EntityTypeParser.cs
+5 −9 Robust.Shared/Utility/DebugTools.cs
+7 −58 Robust.Shared/Utility/FormattedMessage.cs
+1 −2 Robust.Shared/Utility/MarkupNode.cs
+1 −1 Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
+0 −95 Robust.UnitTesting/Shared/Collections/RingBufferListTest.cs
+1 −93 Robust.UnitTesting/Shared/GameObjects/EntityEventBusTests.ComponentEvent.cs
Loading