Merge upstream 24.10.24

[larentoun]

About The Pull Request

Мергируем апстрим

[github-actions[bot]]

This PR causes following conflicts on translate branch:

code/datums/components/food/edible.dm

```diff ++<<<<<<< HEAD + eater.visible_message(span_warning("[eater] eats [food]!"), span_notice("You eat [food].")) ++||||||| 3d6638a1c51 ++ eater.visible_message(span_warning("[src] eats [food]!"), span_notice("You eat [food].")) ++======= + eater.visible_message(span_warning("[declent_ru(NOMINATIVE)] ест [food.declent_ru(ACCUSATIVE)]!"), span_notice("Вы едите [food.declent_ru(ACCUSATIVE)].")) ++>>>>>>> origin/translate ```

code/datums/quirks/negative_quirks/blindness.dm

```diff ++<<<<<<< HEAD + desc = "You are completely blind, nothing can counteract this." + icon = FA_ICON_BLIND ++||||||| 3d6638a1c51 ++ desc = "You are completely blind, nothing can counteract this." ++ icon = FA_ICON_EYE_SLASH ++======= + desc = "Вы полностью слепой, это необратимо." + icon = FA_ICON_EYE_SLASH ++>>>>>>> origin/translate ```

code/modules/antagonists/heretic/heretic_antag.dm

```diff ++<<<<<<< HEAD + var/rune_colour = GLOB.heretic_path_to_color[heretic_path] + target_turf.balloon_alert(user, "drawing rune...") ++||||||| 3d6638a1c51 ++ var/rune_colour = path_to_rune_color[heretic_path] ++ target_turf.balloon_alert(user, "drawing rune...") ++======= + var/rune_colour = path_to_rune_color[heretic_path] + target_turf.balloon_alert(user, "рисуем руну...") ++>>>>>>> origin/translate ```

code/modules/mob/living/carbon/examine.dm

```diff ++<<<<<<< HEAD + bleed_text += "Blood is visible in [t_his] open " ++||||||| 3d6638a1c51 ++ bleed_text += "Blood is visible in [t_his] open" ++======= + bleed_text += "Видна кровь из [t_his] открытых " ++>>>>>>> origin/translate ++<<<<<<< HEAD + . += "[t_His] eyes radiate with a unfeeling, cold detachment. There is nothing but darkness within [t_his] soul." + if(living_user.mind?.holy_role >= HOLY_ROLE_PRIEST) + . += span_warning("PERFECT FOR SMITING!!") + else + living_user.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil) + living_user.set_jitter_if_lower(15 SECONDS) ++||||||| 3d6638a1c51 ++ . += "[t_His] eyes radiate with a unfeeling, cold detachment. There is nothing but darkness within [t_his] soul." ++ living_user.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil) ++ living_user.set_jitter_if_lower(15 SECONDS) ++======= + . += "[t_His] глаза излучают безчувственную, холодную отстраненность. В [t_his] душе нет ничего, кроме тьмы." + living_user.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil) + living_user.set_jitter_if_lower(15 SECONDS) ++>>>>>>> origin/translate ++<<<<<<< HEAD + . += span_notice("[t_He] appear[p_s()] to have been dissected. Useless for examination... for now.") ++||||||| 3d6638a1c51 ++ . += span_notice("[user.p_They()] appear[user.p_s()] to have been dissected. Useless for examination... for now.") ++======= + . += span_notice("Препарирование, похоже, уже было проведено. Бесполезно для обследования... пока что.") ++>>>>>>> origin/translate ```