Merge branch 'master' into Nikko-Species

Resources/Changelog/Floof.yml

@@ -1017,3 +1017,28 @@ Entries:
   id: 137
   time: '2024-09-23T17:49:01.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/203
+- author: Memeji
+  changes:
+    - type: Add
+      message: '"Omen" Artifacts'
+    - type: Add
+      message: Lewd reagents to the reagent spawning effects.
+    - type: Tweak
+      message: Reduced depth at which extremely dangerous effects can occur.
+  id: 138
+  time: '2024-09-23T21:04:33.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/204
+- author: ShatteredSwords
+  changes:
+    - type: Tweak
+      message: Felinids can now be multiple colors instead of human colors.
+  id: 139
+  time: '2024-09-24T06:41:43.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/202
+- author: Memeji
+  changes:
+    - type: Tweak
+      message: Depth changed from 8 to 9.
+  id: 140
+  time: '2024-09-25T04:21:11.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/206

Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: RandomArtifactSpawner
   name: random artifact spawner
   parent: MarkerBase
@@ -18,9 +18,11 @@
         - ComplexXenoArtifact
         - ComplexXenoArtifact
         - ComplexXenoArtifact
+        - OmenXenoArtifactItem # Floof - Artifacts
         - SimpleXenoArtifactItem
         - MediumXenoArtifactItem
         - ComplexXenoArtifactItem
+        - OmenXenoArtifactItem  # Floof - Artifacts
       chance: 1
 
 - type: entity

Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseItem
   id: BaseXenoArtifactItem
   name: alien artifact
@@ -94,6 +94,15 @@
     nodesMin: 9
     nodesMax: 13
 
+- type: entity # Floof - Omen artifact
+  parent: BaseXenoArtifactItem
+  id: OmenXenoArtifactItem
+  suffix: Omen
+  components:
+  - type: Artifact
+    nodesMin: 13
+    nodesMax: 18
+
 # this exists for crafting item artifacts so that the final result can be simple, medium, or complex.
 - type: entity
   parent: BaseXenoArtifactItem

Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseStructureDynamic
   id: BaseXenoArtifact
   name: alien artifact
@@ -88,3 +88,12 @@
     nodesMin: 9
     nodesMax: 13
 
+- type: entity # Floof - Omen artifact
+  parent: BaseXenoArtifact
+  id: OmenXenoArtifact
+  suffix: Omen
+  components:
+  - type: Artifact
+    nodesMin: 13
+    nodesMax: 18
+

Resources/Prototypes/Nyanotrasen/Species/felinid.yml

@@ -6,7 +6,7 @@
   sprites: MobHumanSprites
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
-  skinColoration: HumanToned
+  skinColoration: Hues #FloofStation copied from DeltaV
   minHeight: 0.65
   defaultHeight: 0.8
   maxHeight: 1.1

Resources/Prototypes/XenoArch/Effects/normal_effects.yml

@@ -181,6 +181,9 @@
     - Sodium
     - Water
     - Sulfur
+    - Blood # Floof - Artifact tweaks  
+    - Cum # Floof - Artifact tweaks
+    - Pomelustine # Floof - Artifact tweaks
 
 - type: artifactEffect
   id: EffectCold
@@ -503,6 +506,8 @@
     - Desoxyephedrine
     - Pax
     - Siderlac
+    - Libidozenithizine # Floof - Artifact tweaks
+    - Philterex # Floof - Artifact tweaks
 
 - type: artifactEffect
   id: EffectEmp
@@ -658,7 +663,7 @@
 
 - type: artifactEffect
   id: EffectSingulo
-  targetDepth: 10
+  targetDepth: 9 # Floof - Make it so they can actually occur
   effectHint: artifact-effect-hint-destruction
   components:
   - type: SpawnArtifact
@@ -668,7 +673,7 @@
 
 - type: artifactEffect
   id: EffectTesla
-  targetDepth: 10
+  targetDepth: 9 # Floof - Make it so they can actually occur
   effectHint: artifact-effect-hint-destruction
   components:
   - type: SpawnArtifact