Fix issues found in modpacks

maps/exodus/exodus.dm

@@ -13,13 +13,15 @@
 	#include "../../mods/content/matchmaking/_matchmaking.dme"
 	#include "../../mods/content/modern_earth/_modern_earth.dme"
 	#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
-	#include "../../mods/content/psionics/_psionics.dme"
 	#include "../../mods/content/scaling_descriptors.dm"
 	#include "../../mods/content/xenobiology/_xenobiology.dme"
 
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 	#include "../../mods/mobs/borers/_borers.dme"
 
+	// Must come after borers for compatibility.
+	#include "../../mods/content/psionics/_psionics.dme"
+
 	#include "../../mods/species/ascent/_ascent.dme"
 	#include "../../mods/content/pheromones/_pheromones.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"

maps/ministation/ministation.dm

@@ -34,7 +34,6 @@ Twice...
 	#include "../../mods/content/government/_government.dme"
 	#include "../../mods/content/modern_earth/_modern_earth.dme"
 	#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
-	#include "../../mods/content/psionics/_psionics.dme"
 	#include "../../mods/content/scaling_descriptors.dm"
 
 	#include "ministation_antagonists.dm"
@@ -70,6 +69,9 @@ Twice...
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 	#include "../../mods/mobs/borers/_borers.dme"
 
+	// Must come after borers for compatibility.
+	#include "../../mods/content/psionics/_psionics.dme"
+
 	#include "ministation_overmap.dm"
 
 	#include "jobs/command.dm"

maps/modpack_testing/modpack_testing.dm

@@ -21,7 +21,6 @@
 	#include "../../mods/content/matchmaking/_matchmaking.dme"
 	#include "../../mods/content/modern_earth/_modern_earth.dme"
 	#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
-	#include "../../mods/content/psionics/_psionics.dme"
 	#include "../../mods/content/shackles/_shackles.dme"
 	#include "../../mods/content/xenobiology/_xenobiology.dme"
 	#include "../../mods/content/pheromones/_pheromones.dme"
@@ -31,6 +30,9 @@
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 	#include "../../mods/mobs/borers/_borers.dme"
 
+	// Must come after borers for compatibility.
+	#include "../../mods/content/psionics/_psionics.dme"
+
 	#include "../../mods/species/serpentid/_serpentid.dme"
 	#include "../../mods/species/ascent/_ascent.dme"
 	#include "../../mods/species/neoavians/_neoavians.dme"

maps/tradeship/tradeship.dm

@@ -17,7 +17,6 @@
 	#include "../../mods/content/government/_government.dme"
 	#include "../../mods/content/modern_earth/_modern_earth.dme"
 	#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
-	#include "../../mods/content/psionics/_psionics.dme"
 	#include "../../mods/content/scaling_descriptors.dm"
 	#include "../../mods/content/xenobiology/_xenobiology.dme"
 	#include "../../mods/content/matchmaking/_matchmaking.dme"
@@ -26,6 +25,9 @@
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 	#include "../../mods/mobs/borers/_borers.dme"
 
+	// Must come after borers for compatibility.
+	#include "../../mods/content/psionics/_psionics.dme"
+
 	#include "../../mods/species/ascent/_ascent.dme"
 	#include "../../mods/species/drakes/_drakes.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"

mods/content/bigpharma/_bigpharma.dme

@@ -1,9 +1,11 @@
 #ifndef MODPACK_BIGPHARMA
 #define MODPACK_BIGPHARMA
+// BEGIN_INCLUDE
 #include "_bigpharma.dm"
 #include "chems.dm"
 #include "extension.dm"
 #include "language.dm"
 #include "overrides.dm"
 #include "pill_bottle.dm"
+// END_INCLUDE
 #endif

mods/content/dungeon_loot/_dungeon_loot.dme

@@ -1,9 +1,10 @@
 #ifndef MODPACK_DUNGEON_LOOT
 #define MODPACK_DUNGEON_LOOT
-// BEGIN INCLUDE
+// BEGIN_INCLUDE
 #include "_dungeon_loot.dm"
 #include "loot_pile.dm"
-#include "subtypes/exosuit.dm"
-#include "subtypes/maint.dm"
-#include "subtypes/surface.dm"
+#include "subtypes\exosuit.dm"
+#include "subtypes\maint.dm"
+#include "subtypes\surface.dm"
+// END_INCLUDE
 #endif

mods/content/fantasy/_fantasy.dme

@@ -1,31 +1,33 @@
 #ifndef MODPACK_FANTASY_SPECIES
 #define MODPACK_FANTASY_SPECIES
+// BEGIN_INCLUDE
 #include "_fantasy.dm"
-#include "datum/cultures.dm"
-#include "datum/currencies.dm"
-#include "datum/factions.dm"
-#include "datum/locations.dm"
-#include "datum/outfits.dm"
-#include "datum/overrides.dm"
-#include "datum/species.dm"
-#include "datum/hnoll/bodytypes.dm"
-#include "datum/hnoll/culture.dm"
-#include "datum/hnoll/language.dm"
-#include "datum/hnoll/markings.dm"
-#include "datum/hnoll/organs.dm"
-#include "datum/hnoll/species.dm"
-#include "datum/kobaloi/bodytypes.dm"
-#include "datum/kobaloi/clothing.dm"
-#include "datum/kobaloi/culture.dm"
-#include "datum/kobaloi/language.dm"
-#include "datum/kobaloi/markings.dm"
-#include "datum/kobaloi/organs.dm"
-#include "datum/kobaloi/species.dm"
-#include "items/clothing/_loadout.dm"
-#include "items/clothing/_recipes.dm"
-#include "items/clothing/armor.dm"
-#include "items/clothing/jerkin.dm"
-#include "items/clothing/loincloth.dm"
-#include "items/clothing/overrides.dm"
-#include "items/clothing/trousers.dm"
+#include "datum\cultures.dm"
+#include "datum\currencies.dm"
+#include "datum\factions.dm"
+#include "datum\locations.dm"
+#include "datum\outfits.dm"
+#include "datum\overrides.dm"
+#include "datum\species.dm"
+#include "datum\hnoll\bodytypes.dm"
+#include "datum\hnoll\culture.dm"
+#include "datum\hnoll\language.dm"
+#include "datum\hnoll\markings.dm"
+#include "datum\hnoll\organs.dm"
+#include "datum\hnoll\species.dm"
+#include "datum\kobaloi\bodytypes.dm"
+#include "datum\kobaloi\clothing.dm"
+#include "datum\kobaloi\culture.dm"
+#include "datum\kobaloi\language.dm"
+#include "datum\kobaloi\markings.dm"
+#include "datum\kobaloi\organs.dm"
+#include "datum\kobaloi\species.dm"
+#include "items\clothing\_loadout.dm"
+#include "items\clothing\_recipes.dm"
+#include "items\clothing\armor.dm"
+#include "items\clothing\jerkin.dm"
+#include "items\clothing\loincloth.dm"
+#include "items\clothing\overrides.dm"
+#include "items\clothing\trousers.dm"
+// END_INCLUDE
 #endif

mods/content/generic_shuttles/_generic_shuttles.dme

@@ -1,5 +1,7 @@
 #ifndef MODPACK_GENERIC_SHUTTLES
 #define MODPACK_GENERIC_SHUTTLES
+// BEGIN_INCLUDE
 #include "_generic_shuttles.dm"
-#include "tanker/tanker.dm"
+#include "tanker\tanker.dm"
+// END_INCLUDE
 #endif

mods/content/government/_government.dme

@@ -1,12 +1,12 @@
 #ifndef MODPACK_GOVERNMENT
 #define MODPACK_GOVERNMENT
-// BEGIN INCLUDE
+// BEGIN_INCLUDE
 #include "government.dm"
 #include "datum\ai_holo.dm"
 #include "datum\ai_laws.dm"
 #include "items\clutter.dm"
 #include "items\cups.dm"
 #include "items\documents.dm"
 #include "ruins\ec_old_crash\ec_old_crash.dm"
-#endif
 // END_INCLUDE
+#endif

mods/content/matchmaking/_matchmaking.dme

@@ -1,7 +1,9 @@
 #ifndef CONTENT_PACK_MATCHMAKING
 #define CONTENT_PACK_MATCHMAKING
-#include "matchmaking.dm"
+// BEGIN_INCLUDE
 #include "matchmaker.dm"
-#include "relations_types.dm"
+#include "matchmaking.dm"
 #include "relations.dm"
+#include "relations_types.dm"
+// END_INCLUDE
 #endif

mods/content/mouse_highlights/_mouse_highlight.dme

@@ -1,6 +1,8 @@
 #ifndef CONTENT_PACK_MOUSEOVER
 #define CONTENT_PACK_MOUSEOVER
+// BEGIN_INCLUDE
 #include "mouse_highlight.dm"
 #include "mouse_highlight_client.dm"
 #include "mouse_highlight_prefs.dm"
+// END_INCLUDE
 #endif

mods/content/pheromones/_pheromones.dme

@@ -1,8 +1,10 @@
 #ifndef MODPACK_PHEROMONES
 #define MODPACK_PHEROMONES
+// BEGIN_INCLUDE
 #include "_pheromones.dm"
 #include "pheromone_effect.dm"
 #include "pheromone_emotes.dm"
 #include "pheromone_implant.dm"
 #include "pheromone_mob.dm"
+// END_INCLUDE
 #endif

mods/content/psionics/_psionics.dme

@@ -53,6 +53,7 @@
 #include "system\psionics\interface\ui.dm"
 #include "system\psionics\interface\ui_hub.dm"
 #include "system\psionics\interface\ui_toggles.dm"
+#include "system\psionics\mob\borer_power.dm"
 #include "system\psionics\mob\mob.dm"
 #include "system\psionics\mob\mob_assay.dm"
 #include "system\psionics\mob\mob_interactions.dm"

mods/content/psionics/system/psionics/mob/borer_power.dm

@@ -1,12 +1,8 @@
+#ifdef CONTENT_PACK_BORERS
 /mob/living/simple_animal/borer
 	var/image/aura_image
 
 /mob/living/simple_animal/borer/Initialize(var/mapload, var/gen=1)
-
-	if(!SSmodpacks.loaded_modpacks["Cortical Borers"]) // Borer module not included.
-		log_debug("Attempted spawn of stubbed mobtype [type].")
-		return INITIALIZE_HINT_QDEL
-
 	. = ..()
 	aura_image = create_aura_image(src)
 	aura_image.color = "#aaffaa"
@@ -57,3 +53,4 @@
 			set_ability_cooldown(15 SECONDS)
 
 		return TRUE
+#endif

mods/content/xenobiology/_xenobiology.dme

@@ -1,56 +1,58 @@
 #ifndef CONTENT_PACK_XENOBIO
 #define CONTENT_PACK_XENOBIO
+// BEGIN_INCLUDE
 #include "_xenobiology.dm"
 #include "achievement.dm"
 #include "circuit.dm"
 #include "emotes.dm"
 #include "food.dm"
 #include "overrides.dm"
-#include "colours/_colour.dm"
-#include "colours/colour_adamantine.dm"
-#include "colours/colour_black.dm"
-#include "colours/colour_blue.dm"
-#include "colours/colour_cerulean.dm"
-#include "colours/colour_dark_blue.dm"
-#include "colours/colour_dark_purple.dm"
-#include "colours/colour_gold.dm"
-#include "colours/colour_green.dm"
-#include "colours/colour_grey.dm"
-#include "colours/colour_light_pink.dm"
-#include "colours/colour_metal.dm"
-#include "colours/colour_oil.dm"
-#include "colours/colour_orange.dm"
-#include "colours/colour_pink.dm"
-#include "colours/colour_purple.dm"
-#include "colours/colour_pyrite.dm"
-#include "colours/colour_quantum.dm"
-#include "colours/colour_rainbow.dm"
-#include "colours/colour_red.dm"
-#include "colours/colour_sepia.dm"
-#include "colours/colour_silver.dm"
-#include "colours/colour_yellow.dm"
-#include "mobs/critter_slime.dm"
-#include "mobs/slime_feeding_helpers.dm"
-#include "slime/_slime.dm"
-#include "slime/death.dm"
-#include "slime/examine.dm"
-#include "slime/feeding.dm"
-#include "slime/items.dm"
-#include "slime/items_extract_enhancer.dm"
-#include "slime/items_cell.dm"
-#include "slime/items_potion.dm"
-#include "slime/items_steroid.dm"
-#include "slime/life.dm"
-#include "slime/powers.dm"
-#include "slime/say.dm"
-#include "slime/slime_AI.dm"
-#include "slime/slime_click.dm"
-#include "slime/slime_codex.dm"
-#include "slime/slime_commands.dm"
-#include "slime/slime_comments.dm"
-#include "slime/slime_follow.dm"
-#include "slime/slime_hud.dm"
-#include "slime/slime_reagents.dm"
-#include "slime/slime_surgery.dm"
-#include "slime/slime_update_icon.dm"
+#include "colours\_colour.dm"
+#include "colours\colour_adamantine.dm"
+#include "colours\colour_black.dm"
+#include "colours\colour_blue.dm"
+#include "colours\colour_cerulean.dm"
+#include "colours\colour_dark_blue.dm"
+#include "colours\colour_dark_purple.dm"
+#include "colours\colour_gold.dm"
+#include "colours\colour_green.dm"
+#include "colours\colour_grey.dm"
+#include "colours\colour_light_pink.dm"
+#include "colours\colour_metal.dm"
+#include "colours\colour_oil.dm"
+#include "colours\colour_orange.dm"
+#include "colours\colour_pink.dm"
+#include "colours\colour_purple.dm"
+#include "colours\colour_pyrite.dm"
+#include "colours\colour_quantum.dm"
+#include "colours\colour_rainbow.dm"
+#include "colours\colour_red.dm"
+#include "colours\colour_sepia.dm"
+#include "colours\colour_silver.dm"
+#include "colours\colour_yellow.dm"
+#include "mobs\critter_slime.dm"
+#include "mobs\slime_feeding_helpers.dm"
+#include "slime\_slime.dm"
+#include "slime\death.dm"
+#include "slime\examine.dm"
+#include "slime\feeding.dm"
+#include "slime\items.dm"
+#include "slime\items_cell.dm"
+#include "slime\items_extract_enhancer.dm"
+#include "slime\items_potion.dm"
+#include "slime\items_steroid.dm"
+#include "slime\life.dm"
+#include "slime\powers.dm"
+#include "slime\say.dm"
+#include "slime\slime_AI.dm"
+#include "slime\slime_click.dm"
+#include "slime\slime_codex.dm"
+#include "slime\slime_commands.dm"
+#include "slime\slime_comments.dm"
+#include "slime\slime_follow.dm"
+#include "slime\slime_hud.dm"
+#include "slime\slime_reagents.dm"
+#include "slime\slime_surgery.dm"
+#include "slime\slime_update_icon.dm"
+// END_INCLUDE
 #endif

mods/gamemodes/mixed/_mixed.dme

@@ -1,8 +1,9 @@
 #ifndef GAMEMODE_PACK_MIXED
 #define GAMEMODE_PACK_MIXED
-// BEGIN INCLUDES
+// BEGIN_INCLUDE
+#include "_mixed.dm"
 #if defined(GAMEMODE_PACK_HEIST) // TODO: && defined(GAMEMODE_PACK_MERCENARY)
 #include "crossfire.dm"
 #endif
-// END INCLUDES
+// END_INCLUDE
 #endif

mods/mobs/borers/_borers.dme

@@ -1,5 +1,10 @@
 #ifndef CONTENT_PACK_BORERS
 #define CONTENT_PACK_BORERS
+
+#ifdef MODPACK_PSIONICS
+#warn Psionics modpack loaded before Borers modpack, compatibility features will be missing.
+#endif
+
 // BEGIN_INCLUDE
 #include "borer.dm"
 #include "datum\antagonist.dm"