Moving /datum/species/New() redefine from master_files into core code

baystation12.dme

@@ -3354,7 +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\species.dm"
 #include "mods\_master_files\maps\mapsystem\maps.dm"
 #include "~code\global_init.dm"
 // END_INCLUDE

code/modules/species/species.dm

@@ -330,6 +330,11 @@ The slots that you can use are found in items_clothing.dm and are the inventory
 		else if(!LAZYLEN(available_cultural_info[token]))
 			var/list/map_systems = GLOB.using_map.available_cultural_info[token]
 			available_cultural_info[token] = map_systems.Copy()
+
+		// [SIERRA-ADD] - EXPANDED_CULTURE_DESCRIPTOR - Вносит культуры из мода в список культур после всех возможных альтераций, чтобы предотвратить конфликты при добавлении оффами новых культур
+		if(extended_cultural_info[token])
+			available_cultural_info[token] |= extended_cultural_info[token]
+		// [/SIERRA-ADD]
 
 		if(LAZYLEN(available_cultural_info[token]) && !default_cultural_info[token])
 			var/list/avail_systems = available_cultural_info[token]

mods/expanded_culture_descriptor/README.md

@@ -38,6 +38,7 @@ ID мода: EXPANDED_CULTURE_DESCRIPTOR
 - `code/modules/client/preference_setup/background/03_records.dm`: `/datum/category_item/player_setup_item/background/records/content(mob/user)`, `/datum/category_item/player_setup_item/background/records/OnTopic(href,list/href_list, mob/user)`
 - `code/modules/culture_descriptor/location/_location.dm`: `/singleton/cultural_info/location/get_text_details()`
 - `code/modules/culture_descriptor/culture/cultures_serpentid.dm`: `/singleton/cultural_info/culture/nabber/New()`
+- `code/modules/species/species.dm`: `/datum/species/New()`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.
@@ -75,7 +76,6 @@ ID мода: EXPANDED_CULTURE_DESCRIPTOR
 - `mods/_master_files/code/modules/culture_descriptor/religion/religions_skrell.dm`: `/singleton/cultural_info/religion/warble`
 - `mods/_master_files/code/modules/culture_descriptor/religion/religions_unathi.dm`: `/singleton/cultural_info/religion/unathi`, `/singleton/cultural_info/religion/unathi_precursors`, `/singleton/cultural_info/religion/unathi_strat`, `/singleton/cultural_info/religion/unathi_lights`, `/singleton/cultural_info/religion/unathi_markesh`, `/singleton/cultural_info/religion/unathi_ancestor`, `/singleton/cultural_info/religion/unathi_aga_eakhe`
 - `mods/_master_files/code/modules/culture_descriptor/religion/religions_vox.dm`: `/singleton/cultural_info/religion/vox`
-- `mods/_master_files/code/modules/species/species.dm`: `/datum/species/New()`
 <!--
   Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
   Здесь указываются оверрайды в твоём моде и папке `_master_files`