Merge branch 'Fansana:master' into master

Resources/Changelog/Floof.yml

@@ -594,3 +594,15 @@ Entries:
       message: Fixed the supermatter not spawning in Edge.
   id: 81
   time: '2024-08-21T16:43:40.0000000+00:00'
+- author: neuPanda
+  changes:
+    - type: Fix
+      message: Fixed Rice Pudding
+  id: 82
+  time: '2024-08-22T00:06:58.0000000+00:00'
+- author: ShatteredSwords
+  changes:
+    - type: Add
+      message: New Trait, Vampirism!
+  id: 83
+  time: '2024-08-22T00:07:07.0000000+00:00'

Resources/Locale/en-US/Floof/traits/traits.ftl

@@ -0,0 +1,11 @@
+trait-name-Vampirism = Vampirism
+trait-description-Vampirism = Whether through implantation, genetic modification, or evolution, you have a pair of hollow, sharp fangs used to drink iron-based blood from the beings that contain it.
+
+trait-name-CumProducer = Cock
+trait-description-CumProducer = You have a schlong between your legs.
+
+trait-name-MilkProducer = Boobs
+trait-description-MilkProducer = You have a pair of large mammaries.
+
+trait-name-SquirtProducer = Pussy
+trait-description-SquirtProducer = You have a slit between your legs.

Resources/Locale/en-US/traits/traits.ftl

@@ -173,15 +173,6 @@ trait-name-LightStep = Light Step
 trait-description-LightStep =
     You move with a gentle step, making your footsteps quieter.
 
-trait-name-CumProducer = Cock
-trait-description-CumProducer = You have a schlong between your legs.
-
-trait-name-MilkProducer = Boobs
-trait-description-MilkProducer = You have a pair of large mammaries.
-
-trait-name-SquirtProducer = Pussy
-trait-description-SquirtProducer = You have a slit between your legs.
-
 trait-name-Swashbuckler = Swashbuckler
 trait-description-Swashbuckler =
     You are an expert in swordsmanship, wielding swords, knives, and other blades with unrivaled finesse.

Resources/Prototypes/Floof/Recipes/Cooking/meal_recipes.yml

@@ -110,3 +110,15 @@
     Ketchup: 15
   solids:
     IceCreamBowl: 1
+
+- type: microwaveMealRecipe
+  id: RecipeRicePudding2
+  name: rice pudding recipe
+  result: FoodRicePudding
+  time: 15
+  reagents:
+    Rice: 15
+    Cream: 15
+  solids:
+    FoodBowlBig: 1
+

Resources/Prototypes/Floof/Traits/physical.yml

@@ -0,0 +1,24 @@
+- type: trait
+  id: Vampirism # You may port this to EE, you have my permission!
+  category: Physical
+  points: -1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterSpeciesRequirement # This will be removed once you can edit organs with traits
+      inverted: true
+      species:
+        - Moth
+        - Oni
+        - Diona
+        - SlimePerson
+        - Human
+  components:
+  - type: BloodSucker
+    unitsToSucc: 10
+    injectWhenSucc: false
+    webRequired: false
+