Fix Merge Conflict

new-frontiers-14 · Sep 21, 2023 · ea91d24 · ea91d24
1 parent 53d4ed6
commit ea91d24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml
@@ -1,11 +1,3 @@
-- type: entity
-  id: CrateNPCSlugcat
-  parent: CrateLivestock
-  components:
-  - type: StorageFill
-    contents:
-      - id: MobSlugcat
-
 # - type: entity
   # name: Emotional support pet crate
   # id: CrateNPCEmotionalSupport
@@ -73,3 +65,11 @@
       # - id: MobChickenGhost
         # prob: 1
         # orGroup: MobCatGhost
+
+- type: entity
+  id: CrateNPCSlugcat
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobSlugcat
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml
@@ -146,6 +146,6 @@
         - CrateNPCHamster
         - CrateNPCLizard
         - CrateNPCKangaroo
-        - CreateNPCSlugcat
 #        - CrateNPCEmotionalSupportSafe
+        - CreateNPCSlugcat
       chance: 1