diff --git a/code/modules/culture_descriptor/culture/cultures_serpentid.dm b/code/modules/culture_descriptor/culture/cultures_serpentid.dm index 9b61f6e9d0985..0ab3f24482d79 100644 --- a/code/modules/culture_descriptor/culture/cultures_serpentid.dm +++ b/code/modules/culture_descriptor/culture/cultures_serpentid.dm @@ -31,10 +31,10 @@ // [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 = name - if(findtext_char("[name]","Grade")==0) + if (!findtext_char("[name]", "Grade")) crash_with("Не удалось получить класс ГБС для формирования описания - вероятно, были изменены дефайны классов ГБС") - else - grade = copytext_char("[name]",7) + return + grade = copytext_char("[name]", 7) description = "Вы были обучены корпорацией Xynergy в соответствии с классом [grade] и пригодны для исполнения обязанностей следующих категорий: [english_list(job_titles)]." // [SIERRA-EDIT] diff --git a/code/modules/culture_descriptor/location/_location.dm b/code/modules/culture_descriptor/location/_location.dm index e22827e01d556..31c8accfb614e 100644 --- a/code/modules/culture_descriptor/location/_location.dm +++ b/code/modules/culture_descriptor/location/_location.dm @@ -15,9 +15,9 @@ // if(!isnull(distance)) // SIERRA-EDIT - ORIGINAL // . += "Distance from Sol: [distance]." // SIERRA-EDIT - ORIGINAL if(!isnull(capital)) - . += "Столица: [capital]." + . += "Столица: [capital]." if(!isnull(ruling_body)) - . += "Принадлежность: [ruling_body]." + . += "Принадлежность: [ruling_body]." if(!isnull(distance)) . += "Расстояние от Солнца: [distance]." // [/SIERRA-EDIT] diff --git a/mods/expanded_culture_descriptor/README.md b/mods/expanded_culture_descriptor/README.md index a97edec248fe9..e87fa4a626e5b 100644 --- a/mods/expanded_culture_descriptor/README.md +++ b/mods/expanded_culture_descriptor/README.md @@ -49,7 +49,7 @@ ID мода: EXPANDED_CULTURE_DESCRIPTOR ### Оверрайды -- `mods/_master_files/code/modules/culture_descriptor/_culture.dm`: `/singleton/cultural_info/get_text_details()`, `/singleton/cultural_info/get_description(header, append, verbose = TRUE)` +- `mods/_master_files/code/modules/culture_descriptor/_culture.dm`: `/singleton/cultural_info/get_text_details()`, `/singleton/cultural_info/get_description()` - `mods/_master_files/code/modules/culture_descriptor/culture/cultures_adherent.dm`: `/singleton/cultural_info/culture/adherent` - `mods/_master_files/code/modules/culture_descriptor/culture/cultures_diona.dm`: `/singleton/cultural_info/culture/diona` - `mods/_master_files/code/modules/culture_descriptor/culture/cultures_human.dm`: `/singleton/cultural_info/culture/generic`, `/singleton/cultural_info/culture/human`, `/singleton/cultural_info/culture/human/martian_surfacer`, `/singleton/cultural_info/culture/human/martian_tunneller`, `/singleton/cultural_info/culture/human/luna_poor`, `/singleton/cultural_info/culture/human/luna_rich`, `/singleton/cultural_info/culture/human/venusian_upper`, `/singleton/cultural_info/culture/human/venusian_surfacer`, `/singleton/cultural_info/culture/human/belter`, `/singleton/cultural_info/culture/human/earthling`, `/singleton/cultural_info/culture/human/ceti_north`, `/singleton/cultural_info/culture/human/ceti_south`, `/singleton/cultural_info/culture/human/ceti_interstate`, `/singleton/cultural_info/culture/human/spacer_core`, `/singleton/cultural_info/culture/human/spacer_frontier`, `/singleton/cultural_info/culture/human/confederate`, `/singleton/cultural_info/culture/human/gaia`, `/singleton/cultural_info/culture/human/other`, `/singleton/cultural_info/culture/human/vatgrown`