Laughin' Peas (#25089)

* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas

diff --git a/Resources/Locale/en-US/reagents/laughter.ftl b/Resources/Locale/en-US/reagents/laughter.ftl
new file mode 100644 (file)
index 0000000..b9f7c58
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/laughter.ftl
@@ -0,0 +1 @@
+laughter-effect-control-laughter = You can't contain your laughter!

diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
index a448b45a10f45ee3d9c98ed573a944eff5e9889c..38cd16b01c7124828792ad5df3f20e05325c2c3c 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -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.
 

diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl
index 510d9d084aa643db49285f31169a70cdc5ff3ded..68de618a3652ce7734e15982a813a41303acff0d 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/fun.ftl
+++ b/Resources/Locale/en-US/reagents/meta/fun.ftl
@@ -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.
+

diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 8d55e592f87e6ddf28173f4fbab6299a45839c32..24340e63a61fd0d7b1eb5bb669dcba8b15e35250 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -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

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index f4c136e2952092393868d4a9cde9061aa60fdba6..dca67fa04c4b2b3c10beb4844b025f33a4a71cb0 100644 (file)
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -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

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6087123b4334300d75fbd8e5853dbcab89f08c93..1251884965e96b9ea020980b40959e30e077010c 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2222,6 +2222,9 @@
         collection: FootstepClownFast
     - type: Speech
       speechVerb: Cluwne
+    - type: Bloodstream
+      bloodMaxVolume: 150
+      bloodReagent: Laughter
 
 - type: entity
   name: possum

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 3b3b9b4412037397177e2f511d86e19f78d21665..bc63deeac36f13e542eb653b0329acab5faba7a3 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -112,6 +112,9 @@
           Radiation: 10
     - type: Input
       context: "human"
+    - type: Bloodstream
+      bloodMaxVolume: 300
+      bloodReagent: Laughter
 
 - type: entity
   name: behonker

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index cabeba7dfe290a24ed051d1edcf18615e55e3132..24788bb3cc993741e621eb190160cada2117a803 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -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!

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 2bbb720259d2c4ad180d93f152d80f8cc5283ef4..affdc79defa7fb030bcf8ee62f2ff05c596e52e4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -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

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 7c94546602c814908a546fa80a209c53337ee9a3..649ffa85224a7ce1a7fcc3fe9218ce92053e93d2 100644 (file)
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -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
@@ -1344,6 +1377,8 @@
   packetPrototype: PeaSeeds
   productPrototypes:
     - FoodPeaPod
+  mutationPrototypes:
+    - laughinPea
   lifespan: 25
   growthStages: 3
   maturation: 8

diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index f980f5066aa6a5fc23ac52ea0c096737f301fcbd..8fbfd3cd64b710a12a33c0b7d3a7b117116a4390 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -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

diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index d22e2213ace7c6c71a782592a4736e390aa44d1f..25b0e8da80911f3731f456d20b61b723695213af 100644 (file)
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -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
+

diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 818030a3b33d7f9983bb37414c2cee807ea7387c..a8ccd5f0455b55809b95e89dc35377e7d12a134d 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -161,3 +161,13 @@
     Carbon: 3
     Sugar: 2
 
+- type: reaction
+  id: Laughter
+  reactants:
+    JuiceBanana:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Laughter: 2
+

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png
new file mode 100644 (file)
index 0000000..ded6b2e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png
new file mode 100644 (file)
index 0000000..602809f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
new file mode 100644 (file)
index 0000000..2799387
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
@@ -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"
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png
new file mode 100644 (file)
index 0000000..e4fd37f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png
new file mode 100644 (file)
index 0000000..a4ad791
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..1c710f4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..157a081
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..311098b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png differ