Merge branch 'master' into Nikko-Species

Fansana · Sep 26, 2024 · dcb3862 · dcb3862
2 parents 45a8179 + 861bde0
commit dcb3862
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -1042,3 +1042,17 @@ Entries:
   id: 140
   time: '2024-09-25T04:21:11.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/206
+- author: Memeji
+  changes:
+    - type: Remove
+      message: Omen Item Artifacts.
+  id: 141
+  time: '2024-09-25T22:17:16.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/207
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: The NEIL announcer can once again appear in a shift.
+  id: 142
+  time: '2024-09-25T22:19:49.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/209
diff --git a/Resources/Prototypes/Announcers/!randomAnnouncers.yml b/Resources/Prototypes/Announcers/!randomAnnouncers.yml
@@ -4,5 +4,5 @@
     Intern: 0
     MedBot: 0
     Michael: 1
-    NEIL: 0
+    NEIL: 1
     VoxFem: 0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
@@ -18,11 +18,11 @@
         - ComplexXenoArtifact
         - ComplexXenoArtifact
         - ComplexXenoArtifact
-        - OmenXenoArtifactItem # Floof - Artifacts
+        - OmenXenoArtifact # Floof - Artifacts
         - SimpleXenoArtifactItem
         - MediumXenoArtifactItem
         - ComplexXenoArtifactItem
-        - OmenXenoArtifactItem  # Floof - Artifacts
+        #- OmenXenoArtifactItem  # Floof - Artifacts
       chance: 1
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
@@ -94,14 +94,14 @@
     nodesMin: 9
     nodesMax: 13
 
-- type: entity # Floof - Omen artifact
-  parent: BaseXenoArtifactItem
-  id: OmenXenoArtifactItem
-  suffix: Omen
-  components:
-  - type: Artifact
-    nodesMin: 13
-    nodesMax: 18
+# - 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