Robust Harvest + Diona Interaction and Polymorph effect changed

Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -232,6 +232,53 @@
         tree05: ""
         tree06: ""
 
+- type: entity
+  parent: [BaseControllable, FloraTree] # We cannot also inherit from BaseControllable, because that would also inherit GravityAffected, thus causing the tree to be pullable.
+  id: DionaTree
+  name: tree
+  description: Yep, it's a tree. Why do you feel it looking at you?
+  components:
+  - type: Actions
+  - type: Alerts
+  - type: BodyEmotes # Shhh... the trees are speaking
+    soundsId: DionaBodyEmotes
+  - type: BlockMovement # They should never be moving!
+    blockInteraction: false
+    blockUse: false
+  - type: Clickable
+  - type: ComplexInteraction
+  - type: DoAfter
+  - type: Examiner # Lets polymorphed diona inspect the surrounding area, their "eyes" still work.
+  - type: Hands
+    showInHands: false
+    disableExplosionRecursion: true
+    canBeStripped: false
+    activeHandId: Hand
+    hands:
+      Hand:
+        location: Left
+  - type: Input
+    context: "human"
+  - type: Inventory
+    templateId: dionaTree
+  - type: InventorySlots
+  - type: Puller # Imagine vine-tentacles made out of biomass
+    needsHands: false
+  - type: Transform # Don't move even when pulling stuff
+    anchored: true
+  - type: MindContainer
+  - type: Speech
+    speechSounds: Alto
+    speechVerb: Plant
+    allowedEmotes: ['Chirp']
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treesdiona.rsi
+  - type: Vocal
+    sounds:
+      Male: UnisexDiona
+      Female: UnisexDiona
+      Unsexed: UnisexDiona
+
 - type: entity
   parent: BaseTreeSnow
   id: FloraTreeSnow

Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml

@@ -2,6 +2,16 @@
 - type: inventoryTemplate
   id: diona
   slots:
+    - name: id # By having the ID/PDA listed first, it will get transferred to the robust tree polymorph before the jumpsuit, which would drop the ID without re-equipping it.
+      slotTexture: id
+      fullTextureName: template_small
+      slotFlags: IDCARD
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 2,1
+      strippingWindowPos: 2,4
+      dependsOn: jumpsuit
+      displayName: ID
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
@@ -87,16 +97,6 @@
       dependsOnComponents:
       - type: AllowSuitStorage
       displayName: Suit Storage
-    - name: id
-      slotTexture: id
-      fullTextureName: template_small
-      slotFlags: IDCARD
-      slotGroup: SecondHotbar
-      stripTime: 6
-      uiWindowPos: 2,1
-      strippingWindowPos: 2,4
-      dependsOn: jumpsuit
-      displayName: ID
     - name: belt
       slotTexture: belt
       fullTextureName: template_small

Resources/Prototypes/InventoryTemplates/diona_tree_inventory_template.yml

@@ -0,0 +1,13 @@
+- type: inventoryTemplate # Just here to you keep your PDA on you even after transforming.
+  id: dionaTree # TODO: Prevent equipped items from being shown.
+  slots:
+  - name: id
+    slotTexture: id
+    fullTextureName: template_small
+    slotFlags: IDCARD
+    slotGroup: SecondHotbar
+    stripTime: 6
+    uiWindowPos: 2,1
+    strippingWindowPos: 2,4
+    displayName: ID
+    stripHidden: true

Resources/Prototypes/Polymorphs/polymorph.yml

@@ -129,12 +129,12 @@
 - type: polymorph
   id: TreeMorph
   configuration:
-    entity: FloraTree
+    entity: DionaTree
     forced: true
     transferName: true
     revertOnDeath: true
-    inventory: Drop
-    cooldown: 160
+    inventory: Transfer
+    cooldown: 30
 
 - type: polymorph
   id: SmartCorgiMorph

Resources/Prototypes/Reagents/botany.yml

@@ -134,26 +134,23 @@
         conditions:
         - !type:MetabolizerTypeCondition
           type: [Plant]
-      - !type:HealthChange
-        conditions:
-        - !type:MetabolizerTypeCondition
-          type: [Plant]
-        - !type:ReagentCondition
-          reagent: RobustHarvest
-          min: 30
-        damage:
-          types:
-            Asphyxiation: 1
-            Heat: 2
-            Poison: 1
       - !type:Polymorph
         prototype: TreeMorph
         conditions:
           - !type:MetabolizerTypeCondition
             type: [Plant]
           - !type:ReagentCondition
             reagent: RobustHarvest
-            min: 80
+            min: 25
+      - !type:AdjustReagent
+        reagent: RobustHarvest
+        amount: -10 # Metabolism is paused while polymorphed, so this is to avoid the 999u unkillable diona antag
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
+        - !type:ReagentCondition
+          reagent: RobustHarvest
+          min: 35 # This is one and a half advanced jet injectors worth. Remember that the polymorph cooldown starts and is paused while it is in effect.
 
 - type: reagent
   id: Sedin

Resources/Textures/Objects/Decoration/Flora/flora_treesdiona.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e00cae8d065f9cf520688cc0dd0e15ba5bef12a9, altered by thanosdegraf",
+    "size": {
+        "x": 96,
+        "y": 96
+    },
+    "states": [
+        {
+            "name": "tree01"
+        },
+        {
+            "name": "tree02"
+        },
+        {
+            "name": "tree03"
+        },
+        {
+            "name": "tree04"
+        },
+        {
+            "name": "tree05"
+        },
+        {
+            "name": "tree06"
+        }
+    ]
+}