Fishy swarmers: Carp content and Space Dragon! (#7395)

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Resources/Prototypes/Chemistry/metabolizer_types.yml

@@ -2,14 +2,16 @@
 # you'll likely have to tag its metabolizers with something other than Human.
 
 - type: metabolizerType
-  id: Human
+  id: Animal
 
 - type: metabolizerType
-  id: Animal
+  id: Dragon
+
+- type: metabolizerType
+  id: Human
 
 - type: metabolizerType
   id: Slime
 
 - type: metabolizerType
   id: Vox
-

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -29,12 +29,14 @@
       - FlyingMobMask
       layer:
       - FlyingMobLayer
-  - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: bat
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: bat
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -97,11 +99,15 @@
       5: !type:CriticalMobState {}
       10: !type:DeadMobState {}
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: 0
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    rotate: true
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: 0
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Tag
     tags:
     - Bee
@@ -153,11 +159,14 @@
       state: chicken-0
       sprite: Mobs/Animals/chicken.rsi
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: chicken-0
-      crit: dead-0
-      dead: dead-0
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: chicken-0
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-0
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead-0
   - type: Butcherable
     spawned:
     - id: FoodMeatChicken
@@ -184,11 +193,14 @@
       state: duck-0
       sprite: Mobs/Animals/duck.rsi
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: duck-0
-      crit: dead-0
-      dead: dead-0
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: duck-0
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-0
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead-0
   - type: Butcherable
     spawned:
     - id: FoodMeatDuck
@@ -215,11 +227,14 @@
       state: duck-1
       sprite: Mobs/Animals/duck.rsi
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: duck-1
-      crit: dead-1
-      dead: dead-1
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: duck-1
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-1
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead-1
   - type: Butcherable
     spawned:
     - id: FoodMeatDuck
@@ -246,11 +261,14 @@
       state: duck-2
       sprite: Mobs/Animals/duck.rsi
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: duck-2
-      crit: dead-2
-      dead: dead-2
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: duck-2
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-2
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead-2
   - type: Butcherable
     spawned:
     - id: FoodMeatDuck
@@ -306,11 +324,14 @@
       cyan: "#18a2d5"
       yellow: "#d58c18"
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: butterfly
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: butterfly
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Bloodstream
     bloodMaxVolume: 0.1
   - type: NoSlip
@@ -339,11 +360,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: cow
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: cow
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: SolutionContainerManager
     solutions:
       udder:
@@ -396,11 +420,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: crab
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: crab
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeatCrab
@@ -425,11 +452,14 @@
       state: goat
       sprite: Mobs/Animals/goat.rsi
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: goat
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: goat
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: SolutionContainerManager
     solutions:
       udder:
@@ -470,11 +500,14 @@
       state: goose
       sprite: Mobs/Animals/goose.rsi
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: goose
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: goose
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeatChicken
@@ -513,11 +546,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: crawling
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: crawling
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -553,12 +589,15 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-      - type: DamageStateVisualizer
-        normal: kangaroo
-        # SKIPPY NO!
-        crit: kangaroo-dead
-        dead: kangaroo-dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: kangaroo
+      # SKIPPY NO!
+      Critical:
+        enum.DamageStateVisualLayers.Base: kangaroo-dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: kangaroo-dead
   - type: Puller
 
 - type: entity
@@ -576,11 +615,14 @@
         state: kangaroo-boxing
         sprite: Mobs/Animals/kangaroo.rsi
   - type: Appearance
-    visuals:
-      - type: DamageStateVisualizer
-        normal: kangaroo-boxing
-        crit: kangaroo-boxing-dead
-        dead: kangaroo-boxing-dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: kangaroo-boxing
+      Critical:
+        enum.DamageStateVisualLayers.Base: kangaroo-boxing-dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: kangaroo-boxing-dead
   - type: MeleeWeapon
     range: 1.5
     arcwidth: 0
@@ -626,12 +668,16 @@
   - type: Body
     template: PrimateTemplate
     preset: PrimatePreset
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: monkey
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Appearance
     visuals:
-    - type: DamageStateVisualizer
-      normal: monkey
-      crit: dead
-      dead: dead
     - type: FireVisualizer
       sprite: Mobs/Effects/onfire.rsi
       normalState: Monkey_burning
@@ -688,11 +734,14 @@
     baseWalkSpeed : 5
     baseSprintSpeed : 5
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: mouse-0
-      crit: dead-0
-      dead: splat-0
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: mouse-0
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-0
+      Dead:
+        enum.DamageStateVisualLayers.Base: splat-0
   - type: Food
   - type: Hunger
     baseDecayRate: 0.5 # I'm very hungry! Give me. The cheese.
@@ -762,11 +811,14 @@
   - type: Clothing
     HeldPrefix: 1
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: mouse-1
-      crit: dead-1
-      dead: splat-1
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: mouse-1
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-1
+      Dead:
+        enum.DamageStateVisualLayers.Base: splat-1
   - type: Bloodstream
     bloodMaxVolume: 50
   - type: DiseaseCarrier #Why doesn't this save if it's only on the parent wtf
@@ -785,11 +837,14 @@
   - type: Clothing
     HeldPrefix: 1
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: mouse-2
-      crit: dead-2
-      dead: splat-2
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: mouse-1
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-1
+      Dead:
+        enum.DamageStateVisualLayers.Base: splat-1
   - type: Bloodstream
     bloodMaxVolume: 50
   - type: DiseaseCarrier
@@ -822,11 +877,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: lizard
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: lizard
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -870,11 +928,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: slug
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: slug
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -913,11 +974,14 @@
       layer:
       - SmallMobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: frog
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: frog
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -959,11 +1023,14 @@
       layer:
       - FlyingMobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: parrot
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: parrot
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -1002,11 +1069,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: penguin
-      crit: penguin_dead
-      dead: penguin_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: penguin
+      Critical:
+        enum.DamageStateVisualLayers.Base: penguin_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: penguin_dead
   - type: Butcherable
     spawned:
     - id: FoodMeatPenguin
@@ -1051,11 +1121,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: penguin
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: penguin
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeatPenguin
@@ -1105,11 +1178,13 @@
       - SmallMobMask
       layer:
       - SmallMobLayer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: snake
   - type: Appearance
     visuals:
     - type: RotationVisualizer
-    - type: DamageStateVisualizer
-      normal: snake
 # It's death animation is animated so hopefully this should push for separation between "dying" and "death" states.
      # looks stupid, Rotation visualizer for now
      # dead: dead
@@ -1154,11 +1229,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: tarantula
-      crit: tarantula_dead
-      dead: tarantula_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: tarantula
+      Critical:
+        enum.DamageStateVisualLayers.Base: tarantula_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: tarantula_dead
   - type: Butcherable
     spawned:
     - id: FoodMeatSpider
@@ -1218,11 +1296,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: possum
-      crit: possum_dead # TODO: Make it so possums can "play dead." Probably need AI changes
-      dead: possum_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: possum
+      Critical:
+        enum.DamageStateVisualLayers.Base: possum_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: possum_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -1274,11 +1355,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: raccoon
-      crit: raccoon_dead
-      dead: raccoon_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: raccoon
+      Critical:
+        enum.DamageStateVisualLayers.Base: raccoon_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: raccoon_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -1330,11 +1414,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: fox
-      crit: fox_dead
-      dead: fox_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: fox
+      Critical:
+        enum.DamageStateVisualLayers.Base: fox_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: fox_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat

Resources/Prototypes/Entities/Mobs/NPCs/bear.yml

@@ -33,11 +33,14 @@
       0: !type:NormalMobState {}
       150: !type:DeadMobState {}
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: bear
-      crit: bear_dead
-      dead: bear_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: bear
+      Critical:
+        enum.DamageStateVisualLayers.Base: bear_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: bear_dead
   - type: Butcherable
     spawned:
     - id: FoodMeatBear

Resources/Prototypes/Entities/Mobs/NPCs/carp.yml

@@ -17,6 +17,11 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: alive
       sprite: Mobs/Aliens/Carps/space.rsi
+  - type: CombatMode
+    disarmAction:
+      enabled: false
+      autoPopulate: false
+      name: action-name-disarm
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -35,15 +40,17 @@
       100: !type:DeadMobState {}
   - type: MovementIgnoreGravity
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: alive
-      crit: crit
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: alive
+      Critical:
+        enum.DamageStateVisualLayers.Base: crit
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
-    # TODO: CrapMeat or FishMeat # - 2022-02-17 LMAO crap meat
     spawned:
-    - id: FoodMeat
+    - id: FoodMeatFish
       amount: 2
   - type: MeleeWeapon
     range: 1.5
@@ -55,17 +62,6 @@
       types:
         Piercing: 5
         Slash: 10
-  - type: CombatMode
-    disarmAction:
-      enabled: false
-      autoPopulate: false
-      name: action-name-disarm
-  - type: GhostTakeoverAvailable
-    makeSentient: true
-    name: space carp
-    description: |
-      If you're a salvage spawn, defend the loot inside!
-      Otherwise, wreak havoc on the station!
   - type: ReplacementAccent
     accent: genericAggressive
   - type: TypingIndicator
@@ -84,8 +80,6 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: alive
       sprite: Mobs/Aliens/Carps/magic.rsi
-  - type: GhostTakeoverAvailable
-    name: magicarp
   - type: TypingIndicator
     proto: guardian
 
@@ -93,7 +87,7 @@
   name: holocarp
   parent: MobCarp
   id: MobCarpHolo
-  description: Carp made out of holographic energies.
+  description: Carp made out of holographic energies. Sadly for you, it is very much real.
   components:
   - type: Sprite
     drawdepth: Mobs
@@ -112,8 +106,6 @@
       - MobMask
       layer:
       - Opaque
-  - type: GhostTakeoverAvailable
-    name: holocarp
   - type: TypingIndicator
     proto: robot
 
@@ -128,3 +120,14 @@
       Defend the loot inside the salvage wreck!
   - type: SalvageMobRestrictions
 
+- type: entity
+  name: space carp
+  id: MobCarpDragon
+  suffix: DragonBrood
+  parent: MobCarp
+  components:
+  - type: GhostTakeoverAvailable
+    makeSentient: true
+    name: Sentient Carp
+    description: Help the dragon flood the station with carps!
+

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -24,12 +24,15 @@
       - MobMask
       layer:
       - MobLayer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: corgi
+      Critical:
+        enum.DamageStateVisualLayers.Base: corgi_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: corgi_dead
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: corgi
-      crit: corgi_dead
-      dead: corgi_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -61,11 +64,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: narsian
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: narsian
-      crit: narsian_dead
-      dead: narsian_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: narsian
+      Critical:
+        enum.DamageStateVisualLayers.Base: narsian_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: narsian_dead
   - type: MeleeWeapon
     range: 1.5
     arcwidth: 0
@@ -125,11 +131,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ian
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: ian
-      crit: ian_dead
-      dead: ian_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: ian
+      Critical:
+        enum.DamageStateVisualLayers.Base: ian_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: ian_dead
   - type: Grammar
     attributes:
       proper: true
@@ -152,11 +161,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: old_ian
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: old_ian
-      crit: old_ian_dead
-      dead: old_ian_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: old_ian
+      Critical:
+        enum.DamageStateVisualLayers.Base: old_ian_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: old_ian_dead
   - type: Grammar
     attributes:
       proper: true
@@ -175,11 +187,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: lisa
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: lisa
-      crit: lisa_dead
-      dead: lisa_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: lisa
+      Critical:
+        enum.DamageStateVisualLayers.Base: lisa_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: lisa_dead
   - type: Grammar
     attributes:
       proper: true
@@ -198,11 +213,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: puppy
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: puppy
-      crit: puppy_dead
-      dead: puppy_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: puppy
+      Critical:
+        enum.DamageStateVisualLayers.Base: puppy_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: puppy_dead
   - type: Grammar
     attributes:
       gender: epicene
@@ -231,11 +249,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: cat
-      crit: cat_dead
-      dead: cat_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: cat
+      Critical:
+        enum.DamageStateVisualLayers.Base: cat_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: cat_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -275,11 +296,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat2
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: cat2
-      crit: cat2_dead
-      dead: cat2_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: cat2
+      Critical:
+        enum.DamageStateVisualLayers.Base: cat2_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: cat2_dead
   - type: Grammar
     attributes:
       gender: epicene
@@ -307,11 +331,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: spacecat
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: spacecat
-      crit: spacecat_dead
-      dead: spacecat_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: spacecat
+      Critical:
+        enum.DamageStateVisualLayers.Base: spacecat_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: spacecat_dead
   - type: InteractionPopup
     successChance: 0.7
     interactSuccessString: petting-success-space-cat
@@ -335,11 +362,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: caracal_flop
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: caracal_flop
-      crit: caracal_dead
-      dead: caracal_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: caracal_flop
+      Critical:
+        enum.DamageStateVisualLayers.Base: caracal_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: caracal_dead
   - type: Grammar
     attributes:
       gender: epicene
@@ -381,11 +411,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: sloth
-      crit: sloth_dead
-      dead: sloth_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: sloth
+      Critical:
+        enum.DamageStateVisualLayers.Base: sloth_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: sloth_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -424,11 +457,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: ferret
-      crit: ferret_dead
-      dead: ferret_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: ferret
+      Critical:
+        enum.DamageStateVisualLayers.Base: ferret_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: ferret_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -478,11 +514,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: bingus
-      crit: bingus_dead
-      dead: bingus_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: bingus
+      Critical:
+        enum.DamageStateVisualLayers.Base: bingus_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: bingus_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -521,11 +560,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: mcgriff
-      crit: mcgriff_dead
-      dead: mcgriff_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: mcgriff
+      Critical:
+        enum.DamageStateVisualLayers.Base: mcgriff_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: mcgriff_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -556,11 +598,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: paperwork
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: paperwork
-      crit: paperwork_dead
-      dead: paperwork_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: paperwork
+      Critical:
+        enum.DamageStateVisualLayers.Base: paperwork_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: paperwork_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -598,11 +643,14 @@
       layer:
       - MobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: walter
-      crit: walter_dead
-      dead: walter_dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: walter
+      Critical:
+        enum.DamageStateVisualLayers.Base: walter_dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: walter_dead
   - type: Butcherable
     spawned:
     - id: FoodMeat

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -49,14 +49,17 @@
     damage:
       types:
         Slash: 12
-        Piercing: 8 
+        Piercing: 8
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      rotate: true
-      normal: regalrat
-      crit: dead
-      dead: dead
+  - type: DamageStateVisuals
+    rotate: true
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: regalrat
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Puller
   - type: GhostTakeoverAvailable
     makeSentient: true
@@ -69,7 +72,7 @@
       - DoorBumpOpener
       - FootstepSound
   - type: NoSlip
-  - type: RatKing   
+  - type: RatKing
     actionRaiseArmy:
       useDelay: 4
       icon: Interface/Actions/ratKingArmy.png
@@ -158,12 +161,15 @@
         Slash: 5
         Piercing: 2
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      rotate: true
-      normal: mouse-3
-      crit: dead-3
-      dead: splat-3
+  - type: DamageStateVisuals
+    rotate: true
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: mouse-3
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead-3
+      Dead:
+        enum.DamageStateVisualLayers.Base: splat-3
   - type: Puller
   - type: DiseaseCarrier
     carrierDiseases:

Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml

@@ -38,10 +38,12 @@
       15: !type:DeadMobState {}
   - type: MovementIgnoreGravity
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: alive
-      dead: dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: alive
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Butcherable
     spawned:
     - id: FoodMeatXeno

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -60,12 +60,15 @@
       groups:
         Brute: 20
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      rotate: true
-      normal: running
-      crit: crit
-      dead: dead
+  - type: DamageStateVisuals
+    rotate: true
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: running
+      Critical:
+        enum.DamageStateVisualLayers.Base: crit
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
   - type: Puller
   - type: Butcherable
     butcheringType: Spike
@@ -105,11 +108,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: purple_snake
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: purple_snake
-      crit: dead_purple_snake
-      dead: dead_purple_snake
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: purple_snake
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead_purple_snake
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead_purple_snake
   - type: Grammar
     attributes:
       proper: true
@@ -156,10 +162,13 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: small_purple_snake
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      normal: purple_snake
-      crit: dead_small_purple_snake
-      dead: dead_small_purple_snake
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: small_purple_snake
+      Critical:
+        enum.DamageStateVisualLayers.Base: dead_small_purple_snake
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead_small_purple_snake
   - type: SolutionTransfer
     maxTransferAmount: 1

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -0,0 +1,103 @@
+- type: entity
+  name: space dragon
+  parent: SimpleSpaceMobBase
+  id: MobDragon
+  suffix:
+  description: A flying leviathan, loosely related to space carps.
+  components:
+  - type: GhostTakeoverAvailable
+    makeSentient: true
+    name: Space dragon!
+    description: Crash, roast, flood the station with carps!
+  - type: Speech
+  - type: CombatMode
+    disarmAction:
+      enabled: false
+      autoPopulate: false
+      name: action-name-disarm
+  - type: PlayerMobMover
+  - type: PlayerInputMover
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 5
+    baseSprintSpeed : 5
+  - type: Sprite
+    sprite: Mobs/Aliens/Carps/dragon.rsi
+    noRot: true
+    # TODO: Randomise colors when RandomSpriteColor isn't poopoo
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: alive
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: alive-unshaded
+      shader: unshaded
+  - type: Appearance
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: alive
+        enum.DamageStateVisualLayers.BaseUnshaded: alive-unshaded
+      Critical:
+        enum.DamageStateVisualLayers.Base: crit
+      Dead:
+        enum.DamageStateVisualLayers.Base: dead
+        enum.DamageStateVisualLayers.BaseUnshaded: dead-unshaded
+  - type: Physics
+    bodyType: KinematicController
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.40
+      mass: 50
+      mask:
+      - FlyingMobMask
+      layer:
+      - FlyingMobLayer
+  - type: MobState
+    thresholds:
+      0: !type:NormalMobState {}
+      450: !type:CriticalMobState {}
+      500: !type:DeadMobState {}
+  - type: Metabolizer
+    solutionOnBody: false
+    updateFrequency: 0.25
+    metabolizerTypes: [Dragon]
+    groups:
+    - id: Medicine
+    - id: Poison
+  - type: MovementIgnoreGravity
+  - type: NoSlip
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatDragon
+      amount: 2
+  - type: MeleeWeapon
+    hitSound:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Piercing: 15
+        Slash: 15
+  - type: Dragon
+    spawnsLeft: 2
+    spawnsProto: MobCarpDragon
+    devourAction:
+      event: !type:DragonDevourActionEvent
+      icon: Interface/Actions/devour.png
+      name: action-name-devour
+      description: action-description-devour
+      devourChemical: Ichor
+      devourHealRate: 15.0
+      whitelist:
+        components:
+        - MobState
+        - Door
+        tags:
+        - Wall
+    spawnAction:
+      event: !type:DragonSpawnActionEvent
+      icon: Interface/Actions/carpbirth.png
+      name: action-name-carp-birth
+      description: action-description-carp-birth
+      useDelay: 5
+

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -215,9 +215,10 @@
       layer:
       - LargeMobLayer
   - type: Appearance
-    visuals:
-    - type: DamageStateVisualizer
-      rotate: true
-      normal: onestar_boss
-      dead: onestar_boss_wrecked
+    rotate: true
+    states:
+      Alive:
+        enum.DamageStateVisualLayers.Base: onestar_boss
+      Dead:
+        enum.DamageStateVisualLayers.Base: onestar_boss_wrecked
   - type: CombatMode

Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml

@@ -177,7 +177,7 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 6
-        - ReagentId: CapsaicinOil
+        - ReagentId: CarpoToxin
           Quantity: 3
 # Tastes like fish, batter, hot peppers.
 
@@ -367,6 +367,25 @@
       state: queso
 # Its queso! Everyone loves queso... Right?.
 
+- type: entity
+  name: Sashimi
+  parent: FoodMealBase
+  id: FoodMealSashimi
+  description: It's taste can only be described as "Exotic". The poisoning though? That's pretty common.
+  components:
+  - type: Sprite
+    state: sashimi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: CarpoToxin
+          Quantity: 15
+# tastes exotic
+
 - type: entity
   name: enchiladas
   parent: FoodMealBase

Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml

@@ -48,11 +48,35 @@
       food:
         reagents:
         - ReagentId: Toxin
-          Quantity: 1
+          Quantity: 5
   - type: SliceableFood
     count: 3
     slice: FoodMeatCutlet
 
+- type: entity
+  name: raw carp fillet
+  parent: FoodMeatBase
+  # MeatFish?...
+  id: FoodMeatFish
+  description: Your last words being "Wow, exotic!" are not worth it. The taste itself though? Maybe.
+  components:
+  - type: Tag
+    tags:
+    - Raw
+  - type: Sprite
+    state: fish
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: CarpoToxin
+          Quantity: 5
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: CarpoToxin
+        Quantity: 5
+
 - type: entity
   name: raw bacon
   parent: FoodMeatBase
@@ -216,6 +240,32 @@
         - ReagentId: Toxin
           Quantity: 5
 
+- type: entity
+  name: dragon flesh
+  parent: FoodMeatBase
+  id: FoodMeatDragon
+  description: The dense meat of the space-era apex predator is oozing with it's mythical ichor. Ironically, best eaten raw.
+  components:
+  - type: Tag
+    tags:
+    - Raw
+  - type: Sprite
+    layers:
+    - state: dragon
+    - state: dragon_veins
+      shader: unshaded
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Ichor
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Ichor
+        Quantity: 2
+
 - type: entity
   name: raw lizard meat
   parent: FoodMeatBase

Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml

@@ -2,6 +2,7 @@
   name: trash bag
   id: TrashBag
   parent: BaseStorageItem
+  description: The solution to space pollution. Rubbish removal revolution.
   components:
   - type: Sprite
     netSync: false

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -8,6 +8,9 @@
       alarmedBy:
       - FireAlarm
       - AirAlarm
+    - type: Tag
+      tags:
+        - RCDDeconstructWhitelist
     - type: ApcPowerReceiver
     - type: ExtensionCableReceiver
     - type: DeviceNetwork

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -97,7 +97,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/cult.rsi
   - type: Icon
@@ -336,6 +335,9 @@
   id: WallReinforced
   name: reinforced wall
   components:
+  - type: Tag
+    tags:
+      - Wall
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
   - type: Icon

Resources/Prototypes/Reagents/biological.yml

@@ -28,3 +28,31 @@
       effects:
       - !type:SatiateHunger
         factor: 1.5
+
+- type: reagent
+  id: Ichor
+  name: Ichor
+  group: Biological
+  desc: An extremely potent regenerative chemical, perfected by space fauna evolution. Produced in the dragon's digestive system, it is seen as an exotic commodity due to the gargantuan effort of hunting for it.
+  physicalDesc: roaring
+  color: "#f4692e"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 1.5
+    # Dragon doesn't require airloss healing, so omnizine is still best for humans.
+    Medicine:
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Burn: -5
+            Brute: -5
+            Toxin: -2
+          types:
+            Bloodloss: -5
+  # Just in case you REALLY want to water your plants
+  plantMetabolism:
+  - !type:PlantAdjustWater
+    amount: 0.5

Resources/Prototypes/Reagents/fun.yml

@@ -17,6 +17,14 @@
         type: Local
         messages: [ "carpetium-effect-blood-fibrous", "carpetium-effect-jumpsuit-insides" ]
         probability: 0.1
+      # Hail the madman logic, if it has CARP, means it helps against CARPs
+      - !type:AdjustReagent
+        conditions:
+        - !type:ReagentThreshold
+          reagent: CarpoToxin
+          min: 1
+        reagent: CarpoToxin
+        amount: -3
 
 - type: reagent
   id: Fiber

Resources/Prototypes/Reagents/medicine.yml

@@ -539,6 +539,7 @@
       - !type:SatiateHunger
         factor: -1
 
+  # Should heal quite literally everything, use in very small amounts
 - type: reagent
   id: Omnizine
   name: reagent-name-omnizine
@@ -598,3 +599,4 @@
           min: 1
         reagent: Ultravasculine
         amount: 0.5
+

Resources/Prototypes/Reagents/toxins.yml

@@ -18,6 +18,30 @@
           types:
             Poison: 2
 
+- type: reagent
+  id: CarpoToxin
+  name: Carpotoxin
+  group: Toxins
+  desc: Toxic secretions of a space carp. Causes a painful burning sensation.
+  color: "#e2a38c"
+  physicalDesc: exotic-smelling
+  plantMetabolism:
+  - !type:PlantAdjustToxins
+    amount: 10
+  - !type:PlantAdjustHealth
+    amount: -5
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 4
+      - !type:PopupMessage
+        type: Local
+        messages: [ "generic-reagent-effect-burning-insides" ]
+        probability: 0.33
+
 - type: reagent
   id: PolytrinicAcid
   name: reagent-name-polytrinic-acid
@@ -164,7 +188,7 @@
       - !type:HealthChange
         damage:
           types:
-            Asphyxiation: 4
+            Asphyxiation: 2
   plantMetabolism:
   - !type:PlantAdjustToxins
     amount: 10
@@ -215,7 +239,7 @@
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 30
+          min: 45
         damage:
           groups:
             Brute: 2
@@ -228,7 +252,7 @@
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold
-          min: 30
+          min: 45
         type: Local
         messages: [ "histamine-effect-heavy-itchiness" ]
         probability: 0.2

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -392,6 +392,28 @@
 #  solids:
 #    FoodMeat: 1
 
+- type: microwaveMealRecipe
+  id: RecipeCubanCarp
+  name: cuban carp recipe
+  result: FoodMealCubancarp
+  time: 15
+  solids:
+    FoodDough: 1
+    FoodCheeseSlice: 2
+    FoodChili: 1
+    FoodMeatFish: 2
+
+- type: microwaveMealRecipe
+  id: RecipeSashimi
+  name: sashimi recipe
+  result: FoodMealCubancarp
+  time: 15
+  reagents:
+    TableSalt: 1
+  solids:
+    FoodMeatFish: 2
+
+
 - type: microwaveMealRecipe
   id: RecipeMisoColaSoup
   name: salty sweet milocola soup recipe