Skip to content

Commit

Permalink
Laughin' Peas (#25089)
Browse files Browse the repository at this point in the history
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas
  • Loading branch information
potato1234x authored Feb 10, 2024
1 parent b46944f commit 667cebe
Show file tree
Hide file tree
Showing 21 changed files with 166 additions and 0 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/reagents/laughter.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
laughter-effect-control-laughter = You can't contain your laughter!
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ reagent-desc-ketchup = Made from pureed tomatoes and flavored with spices.
reagent-name-ketchunaise = ketchunaise
reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Americans.
reagent-name-laughin-syrup = laughin' syrup
reagent-desc-laughin-syrup = The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!
reagent-name-mayo = mayonnaise
reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid.
Expand Down
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/reagents/meta/fun.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ reagent-desc-razorium = A strange, non-newtonian chemical. It is produced when t
reagent-name-fresium = Fresium
reagent-desc-fresium = A mysterious compound that slows the vibration of atoms and molecules... somehow. In layman's terms, it makes things cold... REALLY cold. Can cause long-lasting movement issues if ingested.
reagent-name-laughter = Laughter
reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ reagent-physical-desc-energizing = energizing
reagent-physical-desc-exhilarating = exhilarating
reagent-physical-desc-vibrant = vibrant
reagent-physical-desc-fluffy = fluffy
reagent-physical-desc-funny = funny
reagent-physical-desc-alkaline = alkaline
reagent-physical-desc-reflective = reflective
reagent-physical-desc-holy = holy
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/seeds/seeds.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ seeds-poppy-name = poppy
seeds-poppy-display-name = poppies
seeds-aloe-name = aloe
seeds-aloe-display-name = aloe
seeds-laughin-pea-name = laughin' peas
seeds-laughin-pea-display-name = laughin' peas
seeds-lingzhi-name = lingzhi
seeds-lingzhi-display-name = lingzhi
seeds-ambrosiavulgaris-name = ambrosia vulgaris
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2222,6 +2222,9 @@
collection: FootstepClownFast
- type: Speech
speechVerb: Cluwne
- type: Bloodstream
bloodMaxVolume: 150
bloodReagent: Laughter

- type: entity
name: possum
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@
Radiation: 10
- type: Input
context: "human"
- type: Bloodstream
bloodMaxVolume: 300
bloodReagent: Laughter

- type: entity
name: behonker
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,36 @@
- type: Produce
seedId: sugarcane

- type: entity
parent: FoodProduceBase
id: FoodLaughinPeaPod
name: laughin' pea pod
description: The clown's favorite plant.
components:
- type: FlavorProfile
flavors:
- peas
- type: SolutionContainerManager
solutions:
food:
maxVol: 7
reagents:
- ReagentId: Nutriment
Quantity: 3
- ReagentId: Sugar
Quantity: 2
- ReagentId: Laughter
Quantity: 2
- type: Extractable
juiceSolution:
reagents:
- ReagentId: LaughinSyrup
Quantity: 5
- type: Sprite
sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
- type: Produce
seedId: laughinPea

- type: entity
name: tower-cap log
description: It's better than bad, it's good!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@
- type: Sprite
sprite: Objects/Specific/Hydroponics/garlic.rsi

- type: entity
parent: SeedBase
id: LaughinPeaSeeds
name: packet of laughin' pea pods
description: "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
components:
- type: Seed
seedId: laughinPea
- type: Sprite
sprite: Objects/Specific/Hydroponics/laughin_pea.rsi

- type: entity
parent: SeedBase
name: packet of lemon seeds
Expand Down
35 changes: 35 additions & 0 deletions Resources/Prototypes/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,39 @@
Max: 4
PotencyDivisor: 25

- type: seed
id: laughinPea
name: seeds-laughin-pea-name
noun: seeds-noun-seeds
displayName: seeds-laughin-pea-display-name
plantRsi: Objects/Specific/Hydroponics/laughin_pea.rsi
packetPrototype: LaughinPeaSeeds
productPrototypes:
- FoodLaughinPeaPod
lifespan: 25
growthStages: 3
maturation: 8
production: 6
yield: 3
potency: 25
idealLight: 8
harvestRepeat: Repeat
nutrientConsumption: 0.6
waterConsumption: 0.6
chemicals:
Nutriment:
Min: 1
Max: 3
PotencyDivisor: 33
Sugar:
Min: 1
Max: 5
PotencyDivisor: 50
Laughter:
Min: 1
Max: 5
PotencyDivisor: 50

- type: seed
id: lemon
name: seeds-lemon-name
Expand Down Expand Up @@ -1344,6 +1377,8 @@
packetPrototype: PeaSeeds
productPrototypes:
- FoodPeaPod
mutationPrototypes:
- laughinPea
lifespan: 25
growthStages: 3
maturation: 8
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@
color: "#fba399"
recognizable: true

- type: reagent
id: LaughinSyrup
name: reagent-name-laughin-syrup
group: Foods
desc: reagent-desc-laughin-syrup
physicalDesc: reagent-physical-desc-funny
flavor: sweet
color: "#803280"
recognizable: true

- type: reagent
id: Mayo
name: reagent-name-mayo
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Reagents/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,3 +298,24 @@
messages: [ "fresium-effect-frozen"]
probability: 0.4

- type: reagent
id: Laughter
name: reagent-name-laughter
group: Special
desc: reagent-desc-laughter
physicalDesc: reagent-physical-desc-funny
flavor: funny
color: "#FF4DD2"
slippery: true #clown juice gotta slip
metabolisms:
Medicine:
effects:
- !type:Emote
emote: Laugh
probability: 0.3
- !type:PopupMessage
type: Local
visualType: Large
messages: [ "laughter-effect-control-laughter" ]
probability: 0.2

10 changes: 10 additions & 0 deletions Resources/Prototypes/Recipes/Reactions/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,13 @@
Carbon: 3
Sugar: 2

- type: reaction
id: Laughter
reactants:
JuiceBanana:
amount: 1
Sugar:
amount: 1
products:
Laughter: 2

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": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 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"
}
]
}
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 667cebe

Please sign in to comment.