More ECS fixes. Will I never escape this hell?

2025-12-23 19:09:12 -06:00 · 2025-12-23 19:09:12 -06:00 · 95557be4ee
parent e54548fcf6
commit 95557be4ee
14 changed files with 52 additions and 51 deletions
--- a/Content.Client/_Shitmed/Body/Components/LungComponent.cs
+++ b/Content.Client/_Shitmed/Body/Components/LungComponent.cs
@ -1,3 +0,0 @@
-namespace Content.Client._Shitmed.Body.Components;
-[RegisterComponent]
-public sealed partial class LungComponent : Component { }
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@ -1507,7 +1507,7 @@
    - reagents: [ Water, SpaceCleaner ]
      methods: [ Touch ]
      effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie


 # DV - For ancestors without shitmed components (scurrets)
--- a/Resources/Prototypes/Entities/Mobs/Species/golem.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/golem.yml
@ -93,7 +93,7 @@
 #     - reagents: [Water, SpaceCleaner]
 #       methods: [Touch]
 #       effects:
-#       - !type:WashCreamPieReaction
+#       - !type:WashCreamPie
 #   - type: Flashable
 #   - type: Polymorphable
 #   - type: Identity
@ -377,7 +377,7 @@
 #     - reagents: [Water, SpaceCleaner]
 #       methods: [Touch]
 #       effects:
-#       - !type:WashCreamPieReaction
+#       - !type:WashCreamPie
 #   - type: Construction
 #     graph: GolemWood
 #     node: golem
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@ -24,7 +24,7 @@
    - reagents: [ Water, SpaceCleaner ]
      methods: [ Touch ]
      effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
    - reagents: [ Water ]
      methods: [ Touch ]
      effects:
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@ -464,33 +464,33 @@
      # DeltaV - Begin changes (feroxi)
      - !type:Oxygenate
        conditions:
-        - !type:OrganType
-          type: Feroxi
+        - !type:MetabolizerTypeCondition
+          type: [ Feroxi ]
      - !type:SatiateThirst
        conditions:
-        - !type:OrganType
-          type: Feroxi
+        - !type:MetabolizerTypeCondition
+          type: [ Feroxi ]
        factor: 2
      - !type:Oxygenate
        conditions:
-        - !type:OrganType
-          type: FeroxiDehydrated
+        - !type:MetabolizerTypeCondition
+          type: [ FeroxiDehydrated ]
      - !type:SatiateThirst
        conditions:
-        - !type:OrganType
-          type: FeroxiDehydrated
+        - !type:MetabolizerTypeCondition
+          type: [ FeroxiDehydrated ]
        factor: 2
      - !type:ModifyLungGas
        conditions:
-        - !type:OrganType
-          type: Feroxi
+        - !type:MetabolizerTypeCondition
+          type: [ Feroxi ]
        ratios: # DeltaV no duplicating O2 >:3
          CarbonDioxide: 0.5
          WaterVapor: -1.0
      - !type:ModifyLungGas
        conditions:
-        - !type:OrganType
-          type: FeroxiDehydrated
+        - !type:MetabolizerTypeCondition
+          type: [ FeroxiDehydrated ]
        ratios: # DeltaV no duplicating O2 >:3
          CarbonDioxide: 0.5
          WaterVapor: -1.0
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@ -337,9 +337,9 @@
        - !type:ReagentCondition
          reagent: NitrousOxide
          min: 1
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
        key: Anesthesia
        component: Anesthesia
        time: 200
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@ -721,14 +721,14 @@
      effects:
        - !type:SatiateThirst
          conditions: # DeltaV nerf of saline for Feroxi
-          - !type:OrganType
-            type: Feroxi
-            shouldHave: false
+          - !type:MetabolizerTypeCondition
+            type: [ Feroxi ]
+            inverted: true
          factor: 6
        - !type:SatiateThirst # DeltaV nerf of saline for Feroxi
          conditions:
-          - !type:OrganType
-            type: Feroxi
+          - !type:MetabolizerTypeCondition
+            type: [ Feroxi ]
          factor: 2
        - !type:ModifyBloodLevel
          amount: 6
--- a/Resources/Prototypes/_CD/Reagents/biological.yml
+++ b/Resources/Prototypes/_CD/Reagents/biological.yml
@ -13,9 +13,9 @@
      - !type:SatiateThirst
        factor: 1.5
        conditions:
-          - !type:OrganType
-            type: Human
-            shouldHave: false
+          - !type:MetabolizerTypeCondition
+            type: [ Human ]
+            inverted: true
  footstepSound:
    collection: FootstepBlood
    params:
--- a/Resources/Prototypes/_CD/Reagents/medicine.yml
+++ b/Resources/Prototypes/_CD/Reagents/medicine.yml
@ -67,8 +67,8 @@
        probability: 0.045
        conditions:
        - !type:ReagentCondition
-            regent: Neurozenium
-            max: 15
+          reagent: Neurozenium
+          max: 15.1
      - !type:HealthChange
        conditions:
        - !type:ReagentCondition
@ -325,7 +325,7 @@
          min: 1
        reagent: Tranquinase
        amount: 0.1
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
        walkSpeedModifier: 0.8
        sprintSpeedModifier: 0.8
        conditions:
@ -394,23 +394,27 @@
          min: 6.7
        reagent: Histamine # causes allergy-like reaction on OD
        amount: 0.25
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
        walkSpeedModifier: 0.55
        sprintSpeedModifier: 0.55
        conditions:
        - !type:ReagentCondition
          reagent: Serenitol # wildly incompatable with antidepressants
          min: 5
-      - !type:Paralyze
+      - !type:ModifyParalysis
        conditions:
        - !type:ReagentCondition
          reagent: Neurozenium # wildly incompatable with antidepressants
          min: 5
-      - !type:Paralyze
+        time: 2
+        effect: Update
+      - !type:ModifyParalysis
        conditions:
        - !type:ReagentCondition
          reagent: Blissifylovene # wildly incompatable with antidepressants
          min: 3
+        time: 2
+        effect: Update
      - !type:AdjustReagent
        reagent: Neurozenium # purges Neurozenium so paralysis isn't too long
        amount: -0.5
--- a/Resources/Prototypes/_DV/CosmicCult/entropy.yml
+++ b/Resources/Prototypes/_DV/CosmicCult/entropy.yml
@ -41,14 +41,14 @@
  metabolisms:
    Narcotic:
      effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
        walkSpeedModifier: 1.3
        sprintSpeedModifier: 1.3
        conditions:
          - !type:ReagentCondition
            reagent: AntiEntropy
            max: 10
-      - !type:MovespeedModifier # You can use 2 injectors at once for even more speed
+      - !type:MovementSpeedModifier # You can use 2 injectors at once for even more speed
        walkSpeedModifier: 1.5
        sprintSpeedModifier: 1.5
        conditions:
--- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml
@ -12,9 +12,9 @@
      - !type:SatiateThirst
        factor: 2.0
        conditions:
-        - !type:OrganType
-          type: Human
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Human ]
+          inverted: true
    Food:
      effects:
        - !type:AdjustReagent
--- a/Resources/Prototypes/_DV/Reagents/medicine.yml
+++ b/Resources/Prototypes/_DV/Reagents/medicine.yml
@ -82,6 +82,6 @@
        refresh: false
        time: 8.0
        type: Add
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
        walkSpeedModifier: 0.5
        sprintSpeedModifier: 0.5
--- a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml
@ -15,7 +15,7 @@
        - reagents: [Water, SpaceCleaner]
          methods: [Touch]
          effects:
-            - !type:WashCreamPieReaction
+            - !type:WashCreamPie
    - type: DamageOnHighSpeedImpact
      damage:
        types:
--- a/Resources/Prototypes/_Funkystation/Reagents/exotic.yml
+++ b/Resources/Prototypes/_Funkystation/Reagents/exotic.yml
@ -77,7 +77,7 @@
    Narcotic:
      metabolismRate: 0.2
      effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
        walkSpeedModifier: 1.35
        sprintSpeedModifier: 1.35
      - !type:GenericStatusEffect