Merge pull request #588 from MrCat15352/PR1

Add: new enemies
CeladonSS13 · Jun 15, 2024 · 51a8ee2 · 51a8ee2
2 parents ee31ce5 + 464b9ce
commit 51a8ee2
Show file tree

Hide file tree

Showing 22 changed files with 1,632 additions and 1 deletion.
diff --git a/code/__DEFINES/~mods/roaches.dm b/code/__DEFINES/~mods/roaches.dm
@@ -0,0 +1,3 @@
+// Хелпер как в code/__DEFINES/is_helpers.dm
+#define istool(A) istype(A, /obj/item)
+#define isroach(A) istype(A, /mob/living/simple_animal/hostile/asteroid/roach)
diff --git a/mod_celadon/mobs/README.md b/mod_celadon/mobs/README.md
@@ -55,7 +55,8 @@ ID мода: MOBS
 
 ### Дефайны
 
-- Отсутствуют
+- `code/__DEFINES/~mods/roaches.dm` : `istool(A) istype(A, /obj/item)`
+- `code/__DEFINES/~mods/roaches.dm` : `isroach(A) istype(A, /mob/living/simple_animal/hostile/asteroid/roach)`
 <!--
   Если требовалось добавить какие-либо дефайны, укажи файлы,
   в которые ты их добавил, а также перечисли имена.

diff --git a/mod_celadon/mobs/_mobs.dme b/mod_celadon/mobs/_mobs.dme
@@ -7,4 +7,18 @@
 #include "code/pets/syndicat.dm"
 #include "code/pets/syndifox.dm"
 
+#include "code/burrows.dm"
+#include "code/roaches/reagent_containers.dm"
+#include "code/roaches/roach.dm"
+#include "code/roaches/fuhrer.dm"
+#include "code/roaches/benzin.dm"
+#include "code/roaches/bluespace.dm"
+#include "code/roaches/hunter.dm"
+#include "code/roaches/kaiser.dm"
+#include "code/roaches/nanite.dm"
+#include "code/roaches/roachling.dm"
+#include "code/roaches/support.dm"
+#include "code/roaches/tank.dm"
+#include "code/roaches/toxic.dm"
+
 #endif