merge conflict fix and also moving lancer.dm down in .dme

xDanilcusx · Aug 17, 2024 · bf946b4 · bf946b4
1 parent a8d3050
commit bf946b4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -2514,8 +2514,8 @@
 #include "void-marines\code\playable_factions\areas.dm"
 #include "void-marines\code\playable_factions\fl_mod_items.dm"
 #include "void-marines\code\playable_factions\fl_presets.dm"
-#include "void-marines\code\playable_factions\lancer.dm"
 #include "void-marines\code\playable_factions\fl_vendors.dm"
+#include "void-marines\code\playable_factions\lancer.dm"
 #include "void-marines\code\playable_factions\pmc_presets.dm"
 #include "void-marines\code\playable_factions\shuttles.dm"
 #include "void-marines\code\playable_factions\stuff.dm"

diff --git a/icons/mob/humans/onmob/eyes.dmi b/icons/mob/humans/onmob/eyes.dmi