Moved loadout defines to infinity datapack

SierraBay · Nov 26, 2023 · 8566631 · 8566631
1 parent 852c9ca
commit 8566631
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/maps/sierra/sierra.dm b/maps/sierra/sierra.dm
@@ -131,9 +131,6 @@
 	#include "loadout/loadout_uniform.dm"
 	#include "loadout/loadout_xeno.dm"
 	#include "loadout/~defines.dm"
-
-	#include "loadout/~mods/loadout_items/cloaks.dm"
-	#include "loadout/~mods/loadout_items/xenowear.dm"
 
 	// --- MAP FILES --- //
 

diff --git a/mods/loadout_items/README.md b/mods/loadout_items/README.md
@@ -59,9 +59,10 @@ ID мода: LOADOUT_ITEMS
 
 ### Используемые файлы, не содержащиеся в модпаке
 
-- `maps/sierra/~mods/loadout_items/items/clothing/spacesuits/spacesuits.dm`
-- `maps/sierra/~mods/loadout_items/loadout/lists/cloaks.dm`
-- `maps/sierra/~mods/loadout_items/loadout/lists/xenowear.dm`
+- `packs/infinity/~mods/loadout_items/items/clothing/spacesuits/spacesuits.dm`
+- `packs/infinity/~mods/loadout_items/items/clothing/accessories/cloak.dm`
+- `packs/infinity/~mods/loadout_items/loadout/lists/cloaks.dm`
+- `packs/infinity/~mods/loadout_items/loadout/lists/xenowear.dm`
 
 <!--
   Будь то немодульный файл или модульный файл, который не содержится в папке,

diff --git a/packs/infinity/_pack.dm b/packs/infinity/_pack.dm
@@ -84,4 +84,10 @@
 #include "structures\ladder_mobile.dm"
 #include "structures\signs.dm"
 #include "structures\table_presets.dm"
+
+// MODS
+#include "~mods/loadout_items/items/clothing/spacesuits/spacesuits.dm"
+#include "~mods/loadout_items/items/clothing/accessories/cloak.dm"
+#include "~mods/loadout_items/loadout/lists/cloaks.dm"
+#include "~mods/loadout_items/loadout/lists/xenowear.dm"
 #endif
diff --git a/packs/infinity/~mods/loadout_items/items/clothing/accessories/cloak.dm b/packs/infinity/~mods/loadout_items/items/clothing/accessories/cloak.dm
@@ -0,0 +1,5 @@
+/obj/item/clothing/accessory/cloak // A colorable cloak
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'packs/infinity/icons/mob/onmob/onmob_accessories.dmi',
+		SPECIES_NABBER = 'packs/infinity/icons/mob/onmob/onmob_accessories.dmi'
+	)
diff --git a/...s/items/clothing/spacesuits/spacesuits.dm → ...s/items/clothing/spacesuits/spacesuits.dm b/...s/items/clothing/spacesuits/spacesuits.dm → ...s/items/clothing/spacesuits/spacesuits.dm
diff --git a/...ods/loadout_items/loadout/lists/cloaks.dm → ...ods/loadout_items/loadout/lists/cloaks.dm b/...ods/loadout_items/loadout/lists/cloaks.dm → ...ods/loadout_items/loadout/lists/cloaks.dm
diff --git a/...s/loadout_items/loadout/lists/xenowear.dm → ...s/loadout_items/loadout/lists/xenowear.dm b/...s/loadout_items/loadout/lists/xenowear.dm → ...s/loadout_items/loadout/lists/xenowear.dm