diff --git a/baystation12.dme b/baystation12.dme index e186a9da5e8b3..bed2795405930 100644 --- a/baystation12.dme +++ b/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 diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 54bf4c5f9f4a8..33763939f0613 100644 --- a/code/modules/species/species.dm +++ b/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] diff --git a/mods/_master_files/code/modules/species/species.dm b/mods/_master_files/code/modules/species/species.dm deleted file mode 100644 index 83b781fc206b8..0000000000000 --- a/mods/_master_files/code/modules/species/species.dm +++ /dev/null @@ -1,27 +0,0 @@ -/datum/species/New() - . = ..() - for(var/token in ALL_CULTURAL_TAGS) - - var/force_val = force_cultural_info[token] - if(force_val) - default_cultural_info[token] = force_val - available_cultural_info[token] = list(force_val) - - else if(additional_available_cultural_info[token]) - if(!available_cultural_info[token]) - available_cultural_info[token] = list() - available_cultural_info[token] |= additional_available_cultural_info[token] - - 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() - - if(extended_cultural_info[token]) - available_cultural_info[token] |= extended_cultural_info[token] - - if(LAZYLEN(available_cultural_info[token]) && !default_cultural_info[token]) - var/list/avail_systems = available_cultural_info[token] - default_cultural_info[token] = avail_systems[1] - - if(!default_cultural_info[token]) - default_cultural_info[token] = GLOB.using_map.default_cultural_info[token] diff --git a/mods/expanded_culture_descriptor/README.md b/mods/expanded_culture_descriptor/README.md index a18ab9d251f36..a97edec248fe9 100644 --- a/mods/expanded_culture_descriptor/README.md +++ b/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()`