Splitting Bayliens back into individual modpacks.

maps/exodus/exodus.dm

@@ -29,7 +29,11 @@
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 
 	#include "../../mods/species/ascent/_ascent.dme"
-	#include "../../mods/species/bayliens/_bayliens.dme"
+	#include "../../mods/species/tajaran/_tajaran.dme"
+	#include "../../mods/species/unathi/_unathi.dme"
+	#include "../../mods/species/skrell/_skrell.dme"
+	#include "../../mods/species/adherent/_adherent.dme"
+	#include "../../mods/species/tritonian/_tritonian.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"
 	#include "../../mods/species/utility_frames/_utility_frames.dme"
 

maps/ministation/ministation.dm

@@ -45,7 +45,11 @@ Twice...
 
 	#include "../../mods/content/tabloids/_tabloids.dme"
 	#include "../../mods/species/ascent/_ascent.dme"
-	#include "../../mods/species/bayliens/_bayliens.dme"
+	#include "../../mods/species/tajaran/_tajaran.dme"
+	#include "../../mods/species/unathi/_unathi.dme"
+	#include "../../mods/species/skrell/_skrell.dme"
+	#include "../../mods/species/adherent/_adherent.dme"
+	#include "../../mods/species/tritonian/_tritonian.dme"
 	#include "../../mods/species/neoavians/_neoavians.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"
 

maps/modpack_testing/modpack_testing.dm

@@ -39,7 +39,11 @@
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 
 	#include "../../mods/species/ascent/_ascent.dme"
-	#include "../../mods/species/bayliens/_bayliens.dme"
+	#include "../../mods/species/tajaran/_tajaran.dme"
+	#include "../../mods/species/unathi/_unathi.dme"
+	#include "../../mods/species/skrell/_skrell.dme"
+	#include "../../mods/species/adherent/_adherent.dme"
+	#include "../../mods/species/tritonian/_tritonian.dme"
 	#include "../../mods/species/drakes/_drakes.dme"
 	#include "../../mods/species/neoavians/_neoavians.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"

maps/tradeship/tradeship.dm

@@ -39,7 +39,11 @@
 	#include "../../mods/mobs/dionaea/_dionaea.dme"
 
 	#include "../../mods/species/ascent/_ascent.dme"
-	#include "../../mods/species/bayliens/_bayliens.dme"
+	#include "../../mods/species/tajaran/_tajaran.dme"
+	#include "../../mods/species/unathi/_unathi.dme"
+	#include "../../mods/species/skrell/_skrell.dme"
+	#include "../../mods/species/adherent/_adherent.dme"
+	#include "../../mods/species/tritonian/_tritonian.dme"
 	#include "../../mods/species/drakes/_drakes.dme"
 	#include "../../mods/species/neoavians/_neoavians.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"

mods/species/adherent/_adherent.dm

@@ -0,0 +1,31 @@
+#define LANGUAGE_ADHERENT "Protocol"
+#define BP_FLOAT        "floatation disc"
+#define BP_JETS         "maneuvering jets"
+#define BP_COOLING_FINS "cooling fins"
+
+#define SPECIES_ADHERENT  "Adherent"
+#define BODYTYPE_ADHERENT "adherent body"
+
+/decl/modpack/adherent
+	name = "Adherent Species"
+
+/decl/modpack/adherent/pre_initialize()
+	..()
+	SSmodpacks.default_submap_whitelisted_species |= SPECIES_ADHERENT
+
+/mob/living/human/Process_Spacemove(allow_movement)
+	. = ..()
+	if(.)
+		return
+	// This is horrible but short of spawning a jetpack inside the organ than locating
+	// it, I don't really see another viable approach short of a total jetpack refactor.
+	for(var/obj/item/organ/internal/powered/jets/jet in get_internal_organs())
+		if(!jet.is_broken() && jet.active)
+			// Unlike Bay, we don't check or unset inertia_dir here
+			// because the spacedrift subsystem checks the return value of this proc
+			// and unsets inertia_dir if it returns nonzero.
+			return 1
+
+/mob/living/human/adherent/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance)
+	species_name = SPECIES_ADHERENT
+	. = ..()

mods/species/adherent/_adherent.dme

@@ -0,0 +1,15 @@
+#ifndef MODPACK_SPECIES_ADHERENT
+#define MODPACK_SPECIES_ADHERENT
+// BEGIN_INCLUDE
+#include "_adherent.dm"
+#include "datum\culture.dm"
+#include "datum\emotes.dm"
+#include "datum\faction.dm"
+#include "datum\language.dm"
+#include "datum\location.dm"
+#include "datum\species.dm"
+#include "datum\species_bodytypes.dm"
+#include "organs\organs_external.dm"
+#include "organs\organs_internal.dm"
+// END_INCLUDE
+#endif

mods/species/bayliens/adherent/datum/emotes.dm → mods/species/adherent/datum/emotes.dm

@@ -7,9 +7,9 @@
 /decl/emote/audible/adherent_ding
 	key = "ding"
 	emote_message_3p = "$USER$ dings."
-	emote_sound = 'mods/species/bayliens/adherent/sound/ding.ogg'
+	emote_sound = 'mods/species/adherent/sound/ding.ogg'
 
 /decl/emote/audible/adherent_chime
 	key = "chime"
 	emote_message_3p = "$USER$ chimes."
-	emote_sound = 'mods/species/bayliens/adherent/sound/chime.ogg'
+	emote_sound = 'mods/species/adherent/sound/chime.ogg'

mods/species/bayliens/adherent/datum/species.dm → mods/species/adherent/datum/species.dm

@@ -44,7 +44,7 @@
 	hazard_low_pressure =     -1
 	strength =                STR_HIGH
 
-	speech_sounds = list('mods/species/bayliens/adherent/sound/chime.ogg')
+	speech_sounds = list('mods/species/adherent/sound/chime.ogg')
 	speech_chance = 25
 
 	species_flags = SPECIES_FLAG_NO_POISON | SPECIES_FLAG_NO_MINOR_CUT

mods/species/bayliens/adherent/datum/species_bodytypes.dm → mods/species/adherent/datum/species_bodytypes.dm

@@ -2,10 +2,10 @@
 	name = "turquoise"
 	desc = "A gleaming crystalline mass."
 	bodytype_category =         BODYTYPE_ADHERENT
-	icon_template =             'mods/species/bayliens/adherent/icons/template.dmi'
-	icon_base =                 'mods/species/bayliens/adherent/icons/body_turquoise.dmi'
-	damage_overlays =           'mods/species/bayliens/adherent/icons/damage_overlay.dmi'
-	blood_overlays =            'mods/species/bayliens/adherent/icons/blood_overlays.dmi'
+	icon_template =             'mods/species/adherent/icons/template.dmi'
+	icon_base =                 'mods/species/adherent/icons/body_turquoise.dmi'
+	damage_overlays =           'mods/species/adherent/icons/damage_overlay.dmi'
+	blood_overlays =            'mods/species/adherent/icons/blood_overlays.dmi'
 	antaghud_offset_y =         14
 	movement_slowdown =         -1
 	appearance_flags =          HAS_EYE_COLOR
@@ -49,7 +49,7 @@
 		)
 	eye_contaminant_guard = TRUE
 	eye_innate_flash_protection = FLASH_PROTECTION_MAJOR
-	eye_icon = 'mods/species/bayliens/adherent/icons/eyes.dmi'
+	eye_icon = 'mods/species/adherent/icons/eyes.dmi'
 	uid = "bodytype_crystalline_adherent_turquoise"
 
 /decl/bodytype/crystalline/adherent/Initialize()
@@ -105,35 +105,35 @@
 
 /decl/bodytype/crystalline/adherent/emerald
 	name = "emerald"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_emerald.dmi'
+	icon_base = 'mods/species/adherent/icons/body_emerald.dmi'
 	uid = "bodytype_crystalline_adherent_emerald"
 
 /decl/bodytype/crystalline/adherent/amethyst
 	name = "amethyst"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_amethyst.dmi'
+	icon_base = 'mods/species/adherent/icons/body_amethyst.dmi'
 	uid = "bodytype_crystalline_adherent_amethyst"
 
 /decl/bodytype/crystalline/adherent/sapphire
 	name = "sapphire"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_sapphire.dmi'
+	icon_base = 'mods/species/adherent/icons/body_sapphire.dmi'
 	uid = "bodytype_crystalline_adherent_sapphire"
 
 /decl/bodytype/crystalline/adherent/ruby
 	name = "ruby"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_ruby.dmi'
+	icon_base = 'mods/species/adherent/icons/body_ruby.dmi'
 	uid = "bodytype_crystalline_adherent_ruby"
 
 /decl/bodytype/crystalline/adherent/topaz
 	name = "topaz"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_topaz.dmi'
+	icon_base = 'mods/species/adherent/icons/body_topaz.dmi'
 	uid = "bodytype_crystalline_adherent_topaz"
 
 /decl/bodytype/crystalline/adherent/quartz
 	name = "quartz"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_quartz.dmi'
+	icon_base = 'mods/species/adherent/icons/body_quartz.dmi'
 	uid = "bodytype_crystalline_adherent_quartz"
 
 /decl/bodytype/crystalline/adherent/jet
 	name = "jet"
-	icon_base = 'mods/species/bayliens/adherent/icons/body_jet.dmi'
+	icon_base = 'mods/species/adherent/icons/body_jet.dmi'
 	uid = "bodytype_crystalline_adherent_jet"

mods/species/bayliens/adherent/organs/organs_internal.dm → mods/species/adherent/organs/organs_internal.dm

@@ -1,11 +1,11 @@
 #define PROTOCOL_ARTICLE "Protocol article [rand(100,999)]-[uppertext(pick(global.alphabet))] subsection #[rand(10,99)]"
 /datum/action/item_action/organ/adherent
-	button_icon = 'mods/species/bayliens/adherent/icons/actions.dmi'
+	button_icon = 'mods/species/adherent/icons/actions.dmi'
 
 /obj/item/organ/internal/brain/adherent
 	name = "mentality matrix"
 	desc = "The self-contained, self-supporting internal 'brain' of an Adherent unit."
-	icon = 'mods/species/bayliens/adherent/icons/organs.dmi'
+	icon = 'mods/species/adherent/icons/organs.dmi'
 	icon_state = "brain"
 	action_button_name = "Reset Ident"
 	action_button_desc = "Updates your public name to reflect your current job"
@@ -48,7 +48,7 @@
 				to_chat(user, "<span class='notice'>You are now designated <b>[owner.real_name]</b>.</span>")
 
 /obj/item/organ/internal/powered
-	icon = 'mods/species/bayliens/adherent/icons/organs.dmi'
+	icon = 'mods/species/adherent/icons/organs.dmi'
 	organ_properties = ORGAN_PROP_CRYSTAL
 	var/maintenance_cost = 1
 	var/base_action_state
@@ -73,7 +73,7 @@
 /obj/item/organ/internal/powered/attack_self(var/mob/user)
 	. = ..()
 	if(.)
-		sound_to(user, sound('mods/species/bayliens/adherent/sound/ding.ogg'))
+		sound_to(user, sound('mods/species/adherent/sound/ding.ogg'))
 		if(is_broken())
 			to_chat(owner, "<span class='warning'>\The [src] [gender == PLURAL ? "are" : "is"] too damaged to function.</span>")
 			active = FALSE
@@ -120,7 +120,7 @@
 
 /obj/item/organ/internal/eyes/adherent
 	name = "receptor prism"
-	icon = 'mods/species/bayliens/adherent/icons/organs.dmi'
+	icon = 'mods/species/adherent/icons/organs.dmi'
 	icon_state = "eyes"
 	organ_properties = ORGAN_PROP_CRYSTAL
 
@@ -130,7 +130,7 @@
 
 /obj/item/organ/internal/cell/adherent
 	name = "piezoelectric core"
-	icon = 'mods/species/bayliens/adherent/icons/organs.dmi'
+	icon = 'mods/species/adherent/icons/organs.dmi'
 	icon_state = "cell"
 
 /obj/item/organ/internal/powered/cooling_fins