Merge upstream 14.10.24

[larentoun]

About The Pull Request

мерге апстим

[github-actions[bot]]

This PR causes following conflicts on translate branch:

code/datums/mutations/hot.dm

```diff ++<<<<<<< HEAD + desc = "Allows the user to concentrate nearby heat into a pile of ash. Wow. Very interesting." + quality = POSITIVE + text_gain_indication = span_notice("Your hand feels warm.") + instability = POSITIVE_INSTABILITY_MINOR + difficulty = 10 + synchronizer_coeff = 1 ++||||||| e5991546b34 ++ desc = "Allows the user to concentrate nearby heat into a pile of ash. Wow. Very interesting." ++ text_gain_indication = span_notice("Your hand feels warm.") ++======= + desc = "Позволяет обладателю мутации сконцентрировать рядом находящееся тепло в кучу пепла. Вау. Очень интересно." + text_gain_indication = span_notice("Твоя рука кажется тёплой.") ++>>>>>>> origin/translate ++<<<<<<< HEAD + desc = "Draws positive energy from the surroundings to heat surrounding temperatures at subject's will." + quality = POSITIVE + text_gain_indication = span_notice("Your hand feels hot!") + instability = POSITIVE_INSTABILITY_MODERATE + difficulty = 12 + synchronizer_coeff = 1 + energy_coeff = 1 ++||||||| e5991546b34 ++ desc = "Draws positive energy from the surroundings to heat surrounding temperatures at subject's will." ++ text_gain_indication = span_notice("Your hand feels hot!") ++======= + desc = "Притягивает положительную энергию окружения для повышения температуры вокруг субъекта." + text_gain_indication = span_notice("Твоя рука кажется горячей!") ++>>>>>>> origin/translate ```

code/modules/mob/living/basic/space_fauna/carp/carp.dm

```diff ++<<<<<<< HEAD + AddElement(/datum/element/pet_bonus, "bloop") ++||||||| e5991546b34 ++ AddElement(/datum/element/pet_bonus, "bloops happily!") ++======= + AddElement(/datum/element/pet_bonus, "радостно булькает!") ++>>>>>>> origin/translate ```

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

```diff ++<<<<<<< HEAD + balloon_alert_to_viewers("offers something") + visible_message(span_notice("[src] is offering [offered ? "[offered] " : ""][offered_item]."), \ + span_notice("You offer [offered ? "[offered] " : ""][offered_item]."), null, 2) ++||||||| e5991546b34 ++ visible_message(span_notice("[src] is offering [offered ? "[offered] " : ""][offered_item]."), \ ++ span_notice("You offer [offered ? "[offered] " : ""][offered_item]."), null, 2) ++======= + visible_message(span_notice("[capitalize(declent_ru(NOMINATIVE))] предлагает [offered ? "[offered.declent_ru(DATIVE)] " : ""][offered_item.declent_ru(ACCUSATIVE)]."), \ + span_notice("Вы предлагаете [offered ? "[offered.declent_ru(DATIVE)] " : ""][offered_item.declent_ru(ACCUSATIVE)]."), null, 2) ++>>>>>>> origin/translate ```