Floof Directory and merge conflict fix

Fansana · Jul 7, 2024 · 21b3577 · 21b3577
1 parent 4af960e
commit 21b3577
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml
@@ -0,0 +1,7 @@
+- type: loadout
+  id: LoadoutUniformNudePermit
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformNudePermit
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
@@ -259,11 +259,3 @@
   exclusive: true
   items:
     - ClothingUniformColorRainbow
-
-- type: loadout # FloofStation
-  id: LoadoutUniformNudePermit
-  category: Uniform
-  cost: 2
-  exclusive: true
-  items:
-    - ClothingUniformNudePermit