diff --git a/baystation12.dme b/baystation12.dme
index 7c95e9e4c69c2..bed2795405930 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -3354,9 +3354,6 @@
 #include "mods\_master_files\code\modules\events\gravity.dm"
 #include "mods\_master_files\code\modules\mob\new_player\new_player.dm"
 #include "mods\_master_files\code\modules\power\gravitygenerator.dm"
-#include "mods\_master_files\code\modules\species\station\lizard.dm"
-#include "mods\_master_files\code\modules\species\station\machine.dm"
-#include "mods\_master_files\code\modules\species\station\station.dm"
 #include "mods\_master_files\maps\mapsystem\maps.dm"
 #include "~code\global_init.dm"
 // END_INCLUDE
diff --git a/code/modules/culture_descriptor/culture/cultures_serpentid.dm b/code/modules/culture_descriptor/culture/cultures_serpentid.dm
index 2f0ccaf9fb2ed..9b61f6e9d0985 100644
--- a/code/modules/culture_descriptor/culture/cultures_serpentid.dm
+++ b/code/modules/culture_descriptor/culture/cultures_serpentid.dm
@@ -30,7 +30,11 @@
 		LAZYADD(job_titles, "none")
 	// [SIERRA-EDIT] - EXPANDED_CULTURE_DESCRIPTOR - Перевод здесь, потому что переопределение в мастер файлах ломает hidden_valid_jobs. Увы.
 	// description = "You have been trained by Xynergy to [name]. This makes you suitable for the following roles: [english_list(job_titles)]." // SIERRA-EDIT - ORIGINAL
-	var/grade = copytext("[name]",7)
+	var/grade = name
+	if(findtext_char("[name]","Grade")==0)
+		crash_with("Не удалось получить класс ГБС для формирования описания - вероятно, были изменены дефайны классов ГБС")
+	else
+		grade = copytext_char("[name]",7)
 	description = "Вы были обучены корпорацией Xynergy в соответствии с классом [grade] и пригодны для исполнения обязанностей следующих категорий: [english_list(job_titles)]."
 	// [SIERRA-EDIT]
 
diff --git a/mods/_master_files/code/modules/species/station/lizard.dm b/mods/_master_files/code/modules/species/station/lizard.dm
deleted file mode 100644
index bcc32ec859950..0000000000000
--- a/mods/_master_files/code/modules/species/station/lizard.dm
+++ /dev/null
@@ -1,62 +0,0 @@
-/datum/species/unathi
-	available_cultural_info = list(
-		TAG_CULTURE = list(
-			CULTURE_UNATHI_POLAR,
-			CULTURE_UNATHI_DIAMOND_PEAKS,
-			CULTURE_UNATHI_DESERT,
-			CULTURE_UNATHI_SAVANNAH,
-			CULTURE_UNATHI_SALT_SWAMP,
-			CULTURE_UNATHI_SPACE,
-			CULTURE_UNATHI_TERSTEN
-		),
-		TAG_HOMEWORLD = list(
-			HOME_SYSTEM_MOGHES,
-			HOME_SYSTEM_OUERE,
-			HOME_SYSTEM_OFFWORLD,
-			HOME_SYSTEM_UNATHI_TERSTEN
-		),
-		TAG_FACTION = list(
-			FACTION_UNATHI_HEGEMONY,
-			FACTION_UNATHI_SSEN_UUMA,
-			FACTION_UNATHI_BAASK,
-			FACTION_UNATHI_GRESIS,
-			FACTION_UNATHI_TERSTEN,
-			FACTION_NANOTRASEN,
-			FACTION_FREETRADE,
-			FACTION_HEPHAESTUS,
-			FACTION_EXPEDITIONARY,
-			FACTION_PCRC,
-			FACTION_SAARE,
-			FACTION_CORPORATE,
-			FACTION_DAIS,
-			FACTION_ZENG_HU,
-			FACTION_WARD_TAKAHASHI,
-			FACTION_GRAYSON,
-			FACTION_AERTHER,
-			FACTION_MAJOR_BILL,
-			FACTION_FOCAL_POINT,
-			FACTION_XION,
-			FACTION_VEY_MED,
-			FACTION_BISHOP,
-			FACTION_ZPCI,
-			FACTION_SEPTENERGO,
-			FACTION_UNATHI_INDEPENDENT
-		),
-		TAG_RELIGION =  list(
-			RELIGION_UNATHI_STRATAGEM,
-			RELIGION_UNATHI_PRECURSOR,
-			RELIGION_UNATHI_VINE,
-			RELIGION_UNATHI_LIGHTS,
-			RELIGION_UNATHI_MARKESHELI,
-			RELIGION_UNATHI_ANCESTOR,
-			RELIGION_OTHER,
-			RELIGION_UNSTATED
-		)
-	)
-	default_cultural_info = list(
-		TAG_CULTURE   = CULTURE_UNATHI_POLAR,
-		TAG_HOMEWORLD = HOME_SYSTEM_MOGHES,
-		TAG_FACTION   = FACTION_UNATHI_INDEPENDENT,
-		TAG_RELIGION  = RELIGION_OTHER
-	)
-
diff --git a/mods/_master_files/code/modules/species/station/machine.dm b/mods/_master_files/code/modules/species/station/machine.dm
deleted file mode 100644
index 743bc6e3f7772..0000000000000
--- a/mods/_master_files/code/modules/species/station/machine.dm
+++ /dev/null
@@ -1,43 +0,0 @@
-/datum/species/machine
-	description = "Positronic intelligence really took off in the 24th century, and it is not uncommon to see independant, free-willed \
-	robots on many human stations, particularly in fringe systems where standards are slightly lax and public opinion less relevant \
-	to corporate operations. IPCs (Integrated Positronic Chassis) are a loose category of self-willed robots with a humanoid form, \
-	generally self-owned after being 'born' into servitude; they are reliable and dedicated workers, albeit more than slightly \
-	inhuman in outlook and perspective."
-
-	available_cultural_info = list(
-		TAG_CULTURE = list(
-			CULTURE_POSITRONICS_GEN1,
-			CULTURE_POSITRONICS_GEN2,
-			CULTURE_POSITRONICS_GEN3
-		),
-		TAG_HOMEWORLD = list(
-			HOME_SYSTEM_ROOT,
-			HOME_SYSTEM_MARS,
-			HOME_SYSTEM_EARTH,
-			HOME_SYSTEM_LUNA,
-			HOME_SYSTEM_VENUS,
-			HOME_SYSTEM_CERES,
-			HOME_SYSTEM_PLUTO,
-			HOME_SYSTEM_TAU_CETI,
-			HOME_SYSTEM_HELIOS,
-			HOME_SYSTEM_SAFFAR,
-			HOME_SYSTEM_PIRX,
-			HOME_SYSTEM_TADMOR,
-			HOME_SYSTEM_BRAHE,
-			HOME_SYSTEM_IOLAUS,
-			HOME_SYSTEM_FOSTER,
-			HOME_SYSTEM_CASTILLA,
-			HOME_SYSTEM_OTHER
-		),
-		TAG_FACTION = list(
-			FACTION_POSITRONICS,
-			FACTION_SOL_CENTRAL,
-			FACTION_INDIE_CONFED,
-			FACTION_NANOTRASEN,
-			FACTION_FREETRADE,
-			FACTION_XYNERGY,
-			FACTION_EXPEDITIONARY,
-			FACTION_OTHER
-		)
-	)
diff --git a/mods/_master_files/code/modules/species/station/station.dm b/mods/_master_files/code/modules/species/station/station.dm
deleted file mode 100644
index 5fcd55dbf70fe..0000000000000
--- a/mods/_master_files/code/modules/species/station/station.dm
+++ /dev/null
@@ -1,138 +0,0 @@
-/datum/species/human
-	available_cultural_info = list(
-		TAG_CULTURE = list(
-			CULTURE_HUMAN_MARTIAN,
-			CULTURE_HUMAN_MARSTUN,
-			CULTURE_HUMAN_LUNAPOOR,
-			CULTURE_HUMAN_LUNARICH,
-			CULTURE_HUMAN_VENUSIAN,
-			CULTURE_HUMAN_VENUSLOW,
-			CULTURE_HUMAN_BELTER,
-			CULTURE_HUMAN_PLUTO,
-			CULTURE_HUMAN_EARTH,
-			CULTURE_HUMAN_CETIN,
-			CULTURE_HUMAN_CETIS,
-			CULTURE_HUMAN_CETII,
-			CULTURE_HUMAN_SPACER,
-			CULTURE_HUMAN_SPAFRO,
-			CULTURE_HUMAN_CONFED,
-			CULTURE_HUMAN_AVACOMMON, 
-			CULTURE_HUMAN_AVANOBLE,
-			CULTURE_HUMAN_LORRIMAN,
-			CULTURE_HUMAN_LORDUP,
-			CULTURE_HUMAN_LORDLOW,
-			CULTURE_HUMAN_MIRANIAN, 
-			CULTURE_HUMAN_NYXIAN,
-			CULTURE_HUMAN_OTHER
-		),
-		TAG_FACTION = list(
-			FACTION_SOL_CENTRAL,
-			FACTION_FLEET,
-			FACTION_EXPEDITIONARY,
-			FACTION_INDIE_CONFED,
-			FACTION_NANOTRASEN,
-			FACTION_FREETRADE,
-			FACTION_CORPORATE,
-			FACTION_HEPHAESTUS,
-			FACTION_XYNERGY,
-			FACTION_DAIS,
-			FACTION_ZENG_HU,
-			FACTION_WARD_TAKAHASHI,
-			FACTION_GRAYSON,
-			FACTION_AERTHER,
-			FACTION_MAJOR_BILL,
-			FACTION_FOCAL_POINT,
-			FACTION_XION,
-			FACTION_VEY_MED,
-			FACTION_BISHOP,
-			FACTION_SEPTENERGO,
-			FACTION_PCRC,
-			FACTION_SAARE,
-			FACTION_ZPCI,
-			FACTION_OTHER
-		),
-		TAG_HOMEWORLD = list(
-			HOME_SYSTEM_EARTH,
-			HOME_SYSTEM_LUNA,
-			HOME_SYSTEM_MARS,
-			HOME_SYSTEM_VENUS,
-			HOME_SYSTEM_CERES,
-			HOME_SYSTEM_PLUTO,
-			HOME_SYSTEM_TAU_CETI,
-			HOME_SYSTEM_HELIOS,
-			HOME_SYSTEM_TERRA,
-			HOME_SYSTEM_SAFFAR,
-			HOME_SYSTEM_PIRX,
-			HOME_SYSTEM_TADMOR,
-			HOME_SYSTEM_BRAHE,
-			HOME_SYSTEM_IOLAUS,
-			HOME_SYSTEM_GAIA,
-			HOME_SYSTEM_MAGNITKA,
-			HOME_SYSTEM_CASTILLA,
-			HOME_SYSTEM_FOSTER,
-			HOME_SYSTEM_TERSTEN,
-			HOME_SYSTEM_AVALON,
-			HOME_SYSTEM_MIRANIA,
-			HOME_SYSTEM_NYX_BRINKBURN,
-			HOME_SYSTEM_NYX_KALDARK,
-			HOME_SYSTEM_NYX_ROANOK,
-			HOME_SYSTEM_NYX_YUKLIT,
-			HOME_SYSTEM_NYX_CASSER,
-			HOME_SYSTEM_OTHER,
-			HOME_SYSTEM_DEEP_SPACE
-		)
-	)
-
-/datum/species/skrell
-	available_cultural_info = list(
-		TAG_CULTURE = list(
-			CULTURE_SKRELL_QERR,
-			CULTURE_SKRELL_MALISH,
-			CULTURE_SKRELL_KANIN,
-			CULTURE_SKRELL_TALUM,
-			CULTURE_SKRELL_RASKINTA
-		),
-		TAG_HOMEWORLD = list(
-			HOME_SYSTEM_QERRBALAK,
-			HOME_SYSTEM_TALAMIRA,
-			HOME_SYSTEM_ROASORA,
-			HOME_SYSTEM_MITORQI,
-			HOME_SYSTEM_SKRELLSPACE,
-			HOME_SYSTEM_OTHERSKRELL
-		),
-		TAG_FACTION = list(
-			FACTION_EXPEDITIONARY,
-			FACTION_CORPORATE,
-			FACTION_NANOTRASEN,
-			FACTION_PCRC,
-			FACTION_HEPHAESTUS,
-			FACTION_DAIS,
-			FACTION_SKRELL_QERRVOAL,
-			FACTION_SKRELL_QALAOA,
-			FACTION_SKRELL_YIITALANA,
-			FACTION_SKRELL_KRRIGLI,
-			FACTION_SKRELL_QONPRRI,
-			FACTION_SKRELL_MED,
-			FACTION_SKRELL_AIR,
-			FACTION_SKRELL_FOOD,
-			FACTION_SKRELL_OTHERSKRELLFAC,
-			FACTION_SKRELL_OTHERSDTF,
-			FACTION_OTHER
-		),
-		TAG_RELIGION = list(
-			RELIGION_OTHER,
-			RELIGION_ATHEISM,
-			RELIGION_DEISM,
-			RELIGION_AGNOSTICISM,
-			RELIGION_SKRELL
-		)
-	)
-
-/datum/species/diona
-	available_cultural_info = list(
-		TAG_CULTURE =   list(CULTURE_DIONA),
-		TAG_HOMEWORLD = list(HOME_SYSTEM_DIONAEA),
-		TAG_FACTION =   list(FACTION_OTHER),
-		TAG_RELIGION =  list(RELIGION_OTHER)
-	)
-
diff --git a/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme b/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme
index 98185b5a110de..eaf4eb9b3a4c2 100644
--- a/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme
+++ b/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme
@@ -7,27 +7,30 @@
 // #include "code/something.dm"
 
 #include "code\_culture.dm"
-#include "code\language\alain.dm"
-#include "code\language\arabic.dm"
-#include "code\language\chinese.dm"
 #include "code\cultures_human.dm"
 #include "code\cultures_unathi.dm"
-#include "code\language\euro.dm"
 #include "code\factions_human.dm"
 #include "code\factions_ipc.dm"
 #include "code\factions_skrell.dm"
 #include "code\factions_unathi.dm"
-#include "code\language\german.dm"
-#include "code\language\indian.dm"
-#include "code\language\lirris.dm"
 #include "code\locations_human.dm"
 #include "code\locations_ipc.dm"
 #include "code\locations_unathi.dm"
 #include "code\loadout_xeno.dm"
 #include "code\passport.dm"
+#include "code\tajara_culture.dm"
+#include "code\language\alain.dm"
+#include "code\language\arabic.dm"
+#include "code\language\chinese.dm"
+#include "code\language\euro.dm"
+#include "code\language\german.dm"
+#include "code\language\indian.dm"
+#include "code\language\lirris.dm"
 #include "code\language\russian.dm"
 #include "code\language\selenian.dm"
 #include "code\language\spanish.dm"
-#include "code\tajara_culture.dm"
+#include "code\species\station.dm"
+#include "code\species\machine.dm"
+#include "code\species\lizard.dm"
 
 #endif
diff --git a/mods/expanded_culture_descriptor/code/locations_human.dm b/mods/expanded_culture_descriptor/code/locations_human.dm
index e5b8f4e2e12f9..22923926e238e 100644
--- a/mods/expanded_culture_descriptor/code/locations_human.dm
+++ b/mods/expanded_culture_descriptor/code/locations_human.dm
@@ -2,7 +2,7 @@
 	name = HOME_SYSTEM_TERSTEN
 	nickname = "Терстен"
 	distance = "46 световых лет"
-	description = "Терстен — является населенным равнинным миром и третьей планетой системы Гавил, которая расположена в \
+	description = "Терстен является населенным равнинным миром и третьей планетой системы Гавил, которая расположена \
 	примерно в 50 световых годах от Солнечной Системы. Трестен является самой удалённой человеческой колонией в известном \
 	космосе и единственной населённой планетой в системе Гавил. Система Гавил расположенна в \"Лордианском кластере\" — малой \
 	группы из десяти звёзд расположенных близко к друг-другу, и чья история тесно переплетается между собой. Столица — \
diff --git a/mods/expanded_culture_descriptor/code/species/lizard.dm b/mods/expanded_culture_descriptor/code/species/lizard.dm
new file mode 100644
index 0000000000000..1663c498c6986
--- /dev/null
+++ b/mods/expanded_culture_descriptor/code/species/lizard.dm
@@ -0,0 +1,31 @@
+/datum/species/unathi
+	additional_available_cultural_info = list(
+		TAG_CULTURE = list(
+			CULTURE_UNATHI_TERSTEN
+		),
+		TAG_HOMEWORLD = list(
+			HOME_SYSTEM_UNATHI_TERSTEN
+		),
+		TAG_FACTION = list(
+			FACTION_UNATHI_TERSTEN,
+			FACTION_NANOTRASEN,
+			FACTION_FREETRADE,
+			FACTION_HEPHAESTUS,
+			FACTION_EXPEDITIONARY,
+			FACTION_PCRC,
+			FACTION_SAARE,
+			FACTION_CORPORATE,
+			FACTION_DAIS,
+			FACTION_ZENG_HU,
+			FACTION_WARD_TAKAHASHI,
+			FACTION_GRAYSON,
+			FACTION_AERTHER,
+			FACTION_MAJOR_BILL,
+			FACTION_FOCAL_POINT,
+			FACTION_XION,
+			FACTION_VEY_MED,
+			FACTION_BISHOP,
+			FACTION_ZPCI,
+			FACTION_SEPTENERGO
+		)
+	)
diff --git a/mods/expanded_culture_descriptor/code/species/machine.dm b/mods/expanded_culture_descriptor/code/species/machine.dm
new file mode 100644
index 0000000000000..93d67018ce07c
--- /dev/null
+++ b/mods/expanded_culture_descriptor/code/species/machine.dm
@@ -0,0 +1,9 @@
+/datum/species/machine
+	additional_available_cultural_info = list(
+		TAG_HOMEWORLD = list(
+			HOME_SYSTEM_ROOT
+		),
+		TAG_FACTION = list(
+			FACTION_POSITRONICS
+		)
+	)
diff --git a/mods/expanded_culture_descriptor/code/species/station.dm b/mods/expanded_culture_descriptor/code/species/station.dm
new file mode 100644
index 0000000000000..720939017cd03
--- /dev/null
+++ b/mods/expanded_culture_descriptor/code/species/station.dm
@@ -0,0 +1,77 @@
+/datum/species/human
+	additional_available_cultural_info = list(
+		TAG_CULTURE = list(
+			CULTURE_HUMAN_AVACOMMON, 
+			CULTURE_HUMAN_AVANOBLE,
+			CULTURE_HUMAN_LORRIMAN,
+			CULTURE_HUMAN_LORDUP,
+			CULTURE_HUMAN_LORDLOW,
+			CULTURE_HUMAN_MIRANIAN, 
+			CULTURE_HUMAN_NYXIAN
+		),
+		TAG_FACTION = list(
+			FACTION_SOL_CENTRAL,
+			FACTION_FLEET,
+			FACTION_EXPEDITIONARY,
+			FACTION_INDIE_CONFED,
+			FACTION_NANOTRASEN,
+			FACTION_FREETRADE,
+			FACTION_CORPORATE,
+			FACTION_HEPHAESTUS,
+			FACTION_XYNERGY,
+			FACTION_DAIS,
+			FACTION_ZENG_HU,
+			FACTION_WARD_TAKAHASHI,
+			FACTION_GRAYSON,
+			FACTION_AERTHER,
+			FACTION_MAJOR_BILL,
+			FACTION_FOCAL_POINT,
+			FACTION_XION,
+			FACTION_VEY_MED,
+			FACTION_BISHOP,
+			FACTION_SEPTENERGO,
+			FACTION_PCRC,
+			FACTION_SAARE,
+			FACTION_ZPCI,
+			FACTION_OTHER
+		),
+		TAG_HOMEWORLD = list(
+			HOME_SYSTEM_EARTH,
+			HOME_SYSTEM_LUNA,
+			HOME_SYSTEM_MARS,
+			HOME_SYSTEM_VENUS,
+			HOME_SYSTEM_CERES,
+			HOME_SYSTEM_PLUTO,
+			HOME_SYSTEM_TAU_CETI,
+			HOME_SYSTEM_HELIOS,
+			HOME_SYSTEM_TERRA,
+			HOME_SYSTEM_SAFFAR,
+			HOME_SYSTEM_PIRX,
+			HOME_SYSTEM_TADMOR,
+			HOME_SYSTEM_BRAHE,
+			HOME_SYSTEM_IOLAUS,
+			HOME_SYSTEM_GAIA,
+			HOME_SYSTEM_MAGNITKA,
+			HOME_SYSTEM_CASTILLA,
+			HOME_SYSTEM_FOSTER,
+			HOME_SYSTEM_TERSTEN,
+			HOME_SYSTEM_AVALON,
+			HOME_SYSTEM_MIRANIA,
+			HOME_SYSTEM_NYX_BRINKBURN,
+			HOME_SYSTEM_NYX_KALDARK,
+			HOME_SYSTEM_NYX_ROANOK,
+			HOME_SYSTEM_NYX_YUKLIT,
+			HOME_SYSTEM_NYX_CASSER,
+			HOME_SYSTEM_OTHER,
+			HOME_SYSTEM_DEEP_SPACE
+		)
+	)
+
+/datum/species/skrell
+	additional_available_cultural_info = list(
+		TAG_FACTION = list(
+			FACTION_SKRELL_MED,
+			FACTION_SKRELL_AIR,
+			FACTION_SKRELL_FOOD
+		)
+	)