Merge upstream 18.10.24

[larentoun]

About The Pull Request

Апстрим мерге

[github-actions]

This PR causes following conflicts on translate branch:

code/game/objects/items/chainsaw.dm

++<<<<<<< HEAD
 +	RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
++||||||| 7181e2f6237
+ /obj/item/chainsaw/suicide_act(mob/living/carbon/user)
+ 	if(on)
 -		user.visible_message(span_suicide("[user] begins to tear [user.p_their()] head off with [src]! Кажется, [user.ru_p_they()] пытается совершить самоубийство!"))
++		user.visible_message(span_suicide("[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ 		playsound(src, 'sound/items/weapons/chainsawhit.ogg', 100, TRUE)
+ 		var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)
+ 		if(myhead)
+ 			myhead.dismember()
+ 	else
 -		user.visible_message(span_suicide("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! Кажется, [user.ru_p_they()] пытается совершить самоубийство!"))
++		user.visible_message(span_suicide("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!"))
+ 		playsound(src, 'sound/items/weapons/genhit1.ogg', 100, TRUE)
+ 	return BRUTELOSS
 -
 -/obj/item/chainsaw/attack_self(mob/user)
 -	on = !on
 -	to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
 -	force = on ? force_on : initial(force)
 -	throwforce = on ? force_on : initial(force)
 -	icon_state = "chainsaw_[on ? "on" : "off"]"
 -	var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
 -	butchering.butchering_enabled = on
 -
++=======
++/obj/item/chainsaw/suicide_act(mob/living/carbon/user)
+ 	if(on)
 -		hitsound = 'sound/items/weapons/chainsawhit.ogg'
 -		chainsaw_loop.start()
++		user.visible_message(span_suicide("[user] begins to tear [user.p_their()] head off with [src]! Кажется, [user.ru_p_they()] пытается совершить самоубийство!"))
++		playsound(src, 'sound/items/weapons/chainsawhit.ogg', 100, TRUE)
++		var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)
++		if(myhead)
++			myhead.dismember()
+ 	else
 -		hitsound = SFX_SWING_HIT
 -		chainsaw_loop.stop()
 -
 -	toolspeed = on ? 0.5 : initial(toolspeed) //Turning it on halves the speed
 -	if(src == user.get_active_held_item()) //update inhands
 -		user.update_held_items()
 -	update_item_action_buttons()
++		user.visible_message(span_suicide("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! Кажется, [user.ru_p_they()] пытается совершить самоубийство!"))
++		playsound(src, 'sound/items/weapons/genhit1.ogg', 100, TRUE)
++	return BRUTELOSS
++>>>>>>> origin/translate

code/modules/antagonists/heretic/items/heretic_blades.dm

++<<<<<<< HEAD
 +	after_use_message = "The Torn Champion hears your call..."
 +	///If our blade is currently infused with the mansus grasp
 +	var/infused = FALSE
 +
 +/obj/item/melee/sickly_blade/dark/afterattack(atom/target, mob/user, click_parameters)
 +	. = ..()
 +	if(!infused || target == user || !isliving(target))
 +		return
 +	var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
 +	var/mob/living/living_target = target
 +	if(!heretic_datum)
 +		return
 +
 +	//Apply our heretic mark
 +	var/datum/heretic_knowledge/mark/blade_mark/mark_to_apply = heretic_datum.get_knowledge(/datum/heretic_knowledge/mark/blade_mark)
 +	if(!mark_to_apply)
 +		return
 +	mark_to_apply.create_mark(user, living_target)
 +
 +	//Remove the infusion from any blades we own (and update their sprite)
 +	for(var/obj/item/melee/sickly_blade/dark/to_infuse in user.get_all_contents_type(/obj/item/melee/sickly_blade/dark))
 +		to_infuse.infused = FALSE
 +		to_infuse.update_appearance(UPDATE_ICON)
 +	user.update_held_items()
 +
 +	if(!check_behind(user, living_target))
 +		return
 +	// We're officially behind them, apply effects
 +	living_target.AdjustParalyzed(1.5 SECONDS)
 +	living_target.apply_damage(10, BRUTE, wound_bonus = CANT_WOUND)
 +	living_target.balloon_alert(user, "backstab!")
 +	playsound(living_target, 'sound/items/weapons/guillotine.ogg', 100, TRUE)
 +
 +/obj/item/melee/sickly_blade/dark/dropped(mob/user, silent)
 +	. = ..()
 +	if(infused)
 +		infused = FALSE
 +		update_appearance(UPDATE_ICON)
 +
 +/obj/item/melee/sickly_blade/dark/update_icon_state()
 +	. = ..()
 +	if(infused)
 +		icon_state = base_icon_state + "_infused"
 +		inhand_icon_state = base_icon_state + "_infused"
 +	else
 +		icon_state = base_icon_state
 +		inhand_icon_state = base_icon_state
++||||||| 7181e2f6237
++	after_use_message = "The Torn Champion hears your call..."
++=======
+ 	after_use_message = "Разорванный чемпион слышит ваш зов..."
++>>>>>>> origin/translate

code/modules/antagonists/heretic/knowledge/blade_lore.dm

++<<<<<<< HEAD
 +	desc = "Opens up the Path of Blades to you. \
 +		Allows you to transmute a knife with one bar of silver or titanium to create a Sundered Blade. \
 +		You can create up to four at a time."
 +	gain_text = "Our great ancestors forged swords and practiced sparring on the eve of great battles."
++||||||| 7181e2f6237
++	desc = "Opens up the Path of Blades to you. \
++		Allows you to transmute a knife with two bars of silver or titanium to create a Sundered Blade. \
++		You can create up to five at a time."
++	gain_text = "Our great ancestors forged swords and practiced sparring on the eve of great battles."
++=======
+ 	desc = "Открывает перед вами Путь клинков. \
+ 		Позволяет трансмутировать нож с двумя слитками серебра или титаниума для создания Закаленного клинка. \
+ 		Одновременно можно иметь не более пяти."
+ 	gain_text = "Наши великие предки ковали мечи и практиковали спарринги накануне великих сражений."
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	target.balloon_alert(source, "backstab!")
 +	playsound(target, 'sound/items/weapons/guillotine.ogg', 100, TRUE)
++||||||| 7181e2f6237
++	target.balloon_alert(source, "backstab!")
++	playsound(get_turf(target), 'sound/items/weapons/guillotine.ogg', 100, TRUE)
++=======
+ 	target.balloon_alert(source, "удар в спину!")
+ 	playsound(get_turf(target), 'sound/items/weapons/guillotine.ogg', 100, TRUE)
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	name = "Empowered Blades"
 +	desc = "Attacking someone with a Sundered Blade in both hands \
 +		will now deliver a blow with both at once, dealing two attacks in rapid succession. \
 +		The second blow will be slightly weaker. \
 +		You are able to infuse your mansus grasp directly into your blades, and your blades are more effective against structures."
 +	gain_text = "I found him cleaved in twain, halves locked in a duel without end; \
 +		a flurry of blades, neither hitting their mark, for the Champion was indomitable."
++||||||| 7181e2f6237
++	name = "Swift Blades"
++	desc = "Attacking someone with a Sundered Blade in both hands \
++		will now deliver a blow with both at once, dealing two attacks in rapid succession. \
++		The second blow will be slightly weaker."
++	gain_text = "I found him cleaved in twain, halves locked in a duel without end; \
++		a flurry of blades, neither hitting their mark, for the Champion was indomitable."
++=======
+ 	name = "Swift Blades"
+ 	desc = "Атакуя кого-либо с Закаленным клинком в обеих руках, \
+ 	теперь вы будете наносить удар обоими клинками сразу, нанося две атаки в быстрой последовательности. \
+ 	Второй удар будет немного слабее."
+ 	gain_text = "Я нашел его рассеченным на две части, половинки сцепились в дуэли без конца; \
+ 		шквал клинков, но ни один из них не попал в цель, ибо чемпион был неукротим."
++>>>>>>> origin/translate

code/modules/antagonists/heretic/knowledge/side_blade_rust.dm

++<<<<<<< HEAD
 +	desc = "Allows you to transmute a piece of wood, with hide \
 +		from any animal,and a camera to create the Lionhunter's rifle. \
 +		The Lionhunter's Rifle is a long ranged ballistic weapon with three shots. \
 +		These shots function as normal, albeit weak high-caliber munitions when fired from \
 +		close range or at inanimate objects. You can aim the rifle at distant foes, \
 +		causing the shot to mark your victim with your grasp and teleport you directly to them."
 +	gain_text = "I met an old man in an antique shop who wielded a very unusual weapon. \
 +		I could not purchase it at the time, but they showed me how they made it ages ago."
++||||||| 7181e2f6237
++	desc = "Allows you to transmute any ballistic weapon, such as a pipegun, with hide \
++		from any animal, a plank of wood, and a camera to create the Lionhunter's rifle. \
++		The Lionhunter's Rifle is a long ranged ballistic weapon with three shots. \
++		These shots function as normal, albeit weak high-caliber munitions when fired from \
++		close range or at inanimate objects. You can aim the rifle at distant foes, \
++		causing the shot to deal massively increased damage and hone in on them."
++	gain_text = "I met an old man in an antique shop who wielded a very unusual weapon. \
++		I could not purchase it at the time, but they showed me how they made it ages ago."
++=======
+ 	desc = "Позволяет трансмутировать любое баллистическое оружие, например, трубное ружье, с помощью шкуры \
+ 		любого животного, доски дерева и камеры в винтовку Lionhunter. \
+ 		Lionhunter - это дальнобойное баллистическое оружие с тремя выстрелами. \
+ 		При стрельбе с близкого расстояния или по неодушевленным предметам эти выстрелы \
+ 		действуют как обычные, хотя и слабые высококалиберные боеприпасы. Ты можешь направить винтовку на противников на большом расстояние,\
+ 		в результате чего выстрел нанесет значительно больший урон и нацелится на них."
+ 	gain_text = "В антикварном магазине я встретил старика, который владел очень необычным оружием. \
+ 		В то время я не мог его приобрести, но они показали мне, как они делали его много лет назад."
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	desc = "Allows you to transmute 3 ballistic ammo casings (used or unused) of any caliber, \
 +		including shotgun shells to create an extra clip of ammunition for the Lionhunter Rifle."
 +	gain_text = "The weapon came with three rough iron balls, intended to be used as ammunition. \
 +		They were very effective, for simple iron, but used up quickly. I soon ran out. \
 +		No replacement munitions worked in their stead. It was peculiar in what it wanted."
++||||||| 7181e2f6237
++	desc = "Allows you to transmute 3 ballistic ammo casings (used or unused) of any caliber, \
++		including shotgun shot, with any animal hide to create an extra clip of ammunition for the Lionhunter Rifle."
++	gain_text = "The weapon came with three rough iron balls, intended to be used as ammunition. \
++		They were very effective, for simple iron, but used up quickly. I soon ran out. \
++		No replacement munitions worked in their stead. It was peculiar in what it wanted."
++=======
+ 	desc = "Позволяет трансмутировать 3 баллистические гильзы (использованные или неиспользованные) любого калибра, \
+ 		включая дробь, со шкурой любого животного, чтобы создать дополнительную обойму боеприпасов для винтовки Lionhunter."
+ 	gain_text = "К оружию прилагались три грубых железных шара, предназначенных для использования в качестве боеприпасов. \
+ 		Они были очень эффективны для простого железа, но быстро расходовались. Вскоре они у меня закончились. \
+ 		Никакие запасные боеприпасы не помогали. Винтовка была своеобразна в том, чего она хотела."
++>>>>>>> origin/translate

code/modules/antagonists/heretic/structures/mawed_crucible.dm

++<<<<<<< HEAD
 +	break_message = span_warning("[src] falls apart with a thud!")
 +	START_PROCESSING(SSobj, src)
 +
 +/obj/structure/destructible/eldritch_crucible/process(seconds_per_tick)
 +	if(COOLDOWN_TIMELEFT(src, refill_cooldown))
 +		return
 +	COOLDOWN_START(src, refill_cooldown, 30 SECONDS)
 +	current_mass++
 +	playsound(src, 'sound/items/eatfood.ogg', 100, TRUE)
 +	update_appearance(UPDATE_ICON_STATE)
++||||||| 7181e2f6237
++	break_message = span_warning("[src] falls apart with a thud!")
++=======
+ 	break_message = span_warning("[src] разваливается с грохотом!")
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	crucible_tip = "Allows you to see through walls and objects. Lasts 90 seconds."
++||||||| 7181e2f6237
++	crucible_tip = "Allows you to see through walls and objects. Lasts 60 seconds."
++=======
+ 	crucible_tip = "Позволяет видеть сквозь стены и предметы. Действует 60 секунд."
++>>>>>>> origin/translate

code/modules/experisci/experiment/types/scanning_fish.dm

++<<<<<<< HEAD
 +	required_atoms = list(/obj/item/fish = 3)
 +	scan_message = "Scan different species of fish"
++||||||| 7181e2f6237
++	required_atoms = list(/obj/item/fish = 4)
++	scan_message = "Scan different species of fish"
++=======
+ 	required_atoms = list(/obj/item/fish = 4)
+ 	scan_message = "Сканируйте разные виды рыб"
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	name = "Fish Scanning Experiment 2"
 +	description = "An experiment requiring more fish species to be scanned to unlock the 'Ocean' setting for the fishing portal."
++||||||| 7181e2f6237
++	name = "Fish Scanning Experiment 2"
++	description = "An experiment requiring more fish species to be scanned to unlock the 'Chasm' setting for the fishing portal."
++=======
+ 	name = "Эксперимент по скану рыбы (2)"
+ 	description = "Эксперимент, требующий отсканировать больше видов рыб, чтобы разблокировать настройку \"Бездна\" для рыболовного портала."
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	name = "Fish Scanning Experiment 3"
 +	description = "An experiment requiring even more fish species to be scanned to unlock the 'Chasm' setting for the fishing portal."
++||||||| 7181e2f6237
++	name = "Fish Scanning Experiment 3"
++	description = "An experiment requiring even more fish species to be scanned to unlock the 'Ocean' setting for the fishing portal."
++=======
+ 	name = "Эксперимент по скану рыбы (3)"
+ 	description = "Эксперимент, требующий отсканировать еще больше видов рыб, чтобы разблокировать настройку \"Океан\" для рыболовного портала."
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +	required_atoms = list(/obj/item/fish/holo = 3)
 +	scan_message = "Scan different species of holographic fish"
++||||||| 7181e2f6237
++	required_atoms = list(/obj/item/fish/holo = 4)
++	scan_message = "Scan different species of holographic fish"
++=======
+ 	required_atoms = list(/obj/item/fish/holo = 4)
+ 	scan_message = "Сканирование различных видов голографических рыб"
++>>>>>>> origin/translate

code/modules/mob/living/carbon/alien/adult/adult.dm

++<<<<<<< HEAD
 +	lucky_winner.audible_message(span_danger("You hear a deep groan, and a harsh snap like a mantrap."))
 +	lucky_winner.visible_message(span_danger("[src] devours [lucky_winner]!"), \
 +			span_userdanger("[src] devours you!"))
++||||||| 7181e2f6237
++	lucky_winner.audible_message(span_danger("You hear a deep groan, and a harsh snap like a mantrap."))
++	lucky_winner.visible_message(span_danger("[src] devours [lucky_winner]!"), \
++			span_userdanger("[lucky_winner] devours you!"))
++=======
+ 	lucky_winner.audible_message(span_danger("Вы слышите глубокий стон и резкий щелчок, схожий на звук капкана."))
+ 	lucky_winner.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] поглощает [lucky_winner.declent_ru(ACCUSATIVE)]!"), \
+ 			span_userdanger("[capitalize(lucky_winner.declent_ru(NOMINATIVE))] поглощает вас!"))
++>>>>>>> origin/translate

tgui/packages/tgui/interfaces/Uplink/index.tsx

++<<<<<<< HEAD
 +                              <Box>Your current level of threat.</Box> Threat
 +                              determines
 +                              {has_objectives
 +                                ? ' the severity of secondary objectives you get and '
 +                                : ' '}
 +                              what items you can purchase.&nbsp;
 +                              <Box mt={0.5}>
 +                                {/* A minute in deciseconds */}
 +                                Threat passively increases by{' '}
 +                                <Box color="green" as="span">
 +                                  {calculateProgression(
 +                                    current_progression_scaling,
 +                                  )}
++||||||| 7181e2f6237
++                              <Box>
++                                <Box>Your current level of threat.</Box> Threat
++                                determines
++                                {has_objectives
++                                  ? ' the severity of secondary objectives you get and '
++                                  : ' '}
++                                what items you can purchase.&nbsp;
++                                <Box mt={0.5}>
++                                  {/* A minute in deciseconds */}
++                                  Threat passively increases by{' '}
++                                  <Box color="green" as="span">
++                                    {calculateProgression(
++                                      current_progression_scaling,
++                                    )}
++                                  </Box>
++                                  &nbsp;every minute
++=======
+                               <Box>
+                                 <Box>Ваше текущее значение угрозы.</Box> Угроза
+                                 влияет на
+                                 {has_objectives
+                                   ? ' сложность получаемых второстепенных задач и '
+                                   : ' '}
+                                 список доступных для покупки предметов.&nbsp;
+                                 <Box mt={0.5}>
+                                   {/* A minute in deciseconds */}
+                                   Угроза пассивно увеличивается на{' '}
+                                   <Box color="green" as="span">
+                                     {calculateProgression(
+                                       current_progression_scaling,
+                                     )}
+                                   </Box>
+                                   &nbsp;каждую минуту
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +                                &nbsp;every minute
++||||||| 7181e2f6237
++                                {Math.abs(progressionPercentage) > 0 && (
++                                  <Box mt={0.5}>
++                                    Because your threat level is
++                                    {progressionPercentage < 0
++                                      ? ' ahead '
++                                      : ' behind '}
++                                    of where it should be, you are getting
++                                    <Box
++                                      as="span"
++                                      color={
++                                        progressionPercentage < 0
++                                          ? 'red'
++                                          : 'green'
++                                      }
++                                      ml={1}
++                                      mr={1}
++                                    >
++                                      {progressionPercentage}%
++                                    </Box>
++                                    {progressionPercentage < 0
++                                      ? 'less'
++                                      : 'more'}{' '}
++                                    threat every minute
++                                  </Box>
++                                )}
++                                {dangerLevelsTooltip}
++=======
+                                 {Math.abs(progressionPercentage) > 0 && (
+                                   <Box mt={0.5}>
+                                     Так как ваша угроза
+                                     {progressionPercentage < 0
+                                       ? ' выше '
+                                       : ' ниже '}
+                                     той, на которой вы должны быть, вы получаете
+                                     <Box
+                                       as="span"
+                                       color={
+                                         progressionPercentage < 0
+                                           ? 'red'
+                                           : 'green'
+                                       }
+                                       ml={1}
+                                       mr={1}
+                                     >
+                                       {progressionPercentage}%
+                                     </Box>
+                                     {progressionPercentage < 0
+                                       ? 'меньше'
+                                       : 'больше'}{' '}
+                                     угрозы каждую минуту
+                                   </Box>
+                                 )}
+                                 {dangerLevelsTooltip}
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +                          </Box>
++||||||| 7181e2f6237
++                          )) ||
++                          "Your current threat level. You are a killing machine and don't need to improve your threat level."
++=======
+                           )) ||
+                           'Ваш текущий уровень угрозы. Вы машина для убийств и не нуждаетесь в повышении уровня угрозы.'
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +                          <Tabs.Tab
 +                            style={{
 +                              overflow: 'hidden',
 +                              whiteSpace: 'nowrap',
 +                              textOverflow: 'ellipsis',
 +                            }}
 +                            icon="star-half-stroke"
 +                            selected={currentTab === 1}
 +                            onClick={() => this.setState({ currentTab: 1 })}
 +                          >
 +                            Secondary Objectives
 +                          </Tabs.Tab>
++||||||| 7181e2f6237
++                          <>
++                            <Tabs.Tab
++                              style={{
++                                overflow: 'hidden',
++                                whiteSpace: 'nowrap',
++                                textOverflow: 'ellipsis',
++                              }}
++                              icon="star"
++                              selected={currentTab === 0}
++                              onClick={() => this.setState({ currentTab: 0 })}
++                            >
++                              Primary Objectives
++                            </Tabs.Tab>
++                            <Tabs.Tab
++                              style={{
++                                overflow: 'hidden',
++                                whiteSpace: 'nowrap',
++                                textOverflow: 'ellipsis',
++                              }}
++                              icon="star-half-stroke"
++                              selected={currentTab === 1}
++                              onClick={() => this.setState({ currentTab: 1 })}
++                            >
++                              Secondary Objectives
++                            </Tabs.Tab>
++                          </>
++=======
+                           <>
+                             <Tabs.Tab
+                               style={{
+                                 overflow: 'hidden',
+                                 whiteSpace: 'nowrap',
+                                 textOverflow: 'ellipsis',
+                               }}
+                               icon="star"
+                               selected={currentTab === 0}
+                               onClick={() => this.setState({ currentTab: 0 })}
+                             >
+                               Основные задачи
+                             </Tabs.Tab>
+                             <Tabs.Tab
+                               style={{
+                                 overflow: 'hidden',
+                                 whiteSpace: 'nowrap',
+                                 textOverflow: 'ellipsis',
+                               }}
+                               icon="star-half-stroke"
+                               selected={currentTab === 1}
+                               onClick={() => this.setState({ currentTab: 1 })}
+                             >
+                               Дополнительные задачи
+                             </Tabs.Tab>
+                           </>
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +                  {!!lockable && (
 +                    <Stack.Item>
 +                      <Button
 +                        lineHeight={2.5}
 +                        textAlign="center"
 +                        icon="lock"
 +                        color="transparent"
 +                        px={2}
 +                        onClick={() => act('lock')}
 +                      >
 +                        Lock
 +                      </Button>
 +                    </Stack.Item>
 +                  )}
 +                </Stack>
 +              </Section>
 +            </Stack.Item>
++||||||| 7181e2f6237
++                    {!!lockable && (
++                      <Stack.Item>
++                        <Button
++                          lineHeight={2.5}
++                          textAlign="center"
++                          icon="lock"
++                          color="transparent"
++                          px={2}
++                          onClick={() => act('lock')}
++                        >
++                          Lock
++                        </Button>
++                      </Stack.Item>
++                    )}
++                  </Stack>
++                </Section>
++              </Stack.Item>
++            )}
++=======
+                     {!!lockable && (
+                       <Stack.Item>
+                         <Button
+                           lineHeight={2.5}
+                           textAlign="center"
+                           icon="lock"
+                           color="transparent"
+                           px={2}
+                           onClick={() => act('lock')}
+                         >
+                           Заблокировать
+                         </Button>
+                       </Stack.Item>
+                     )}
+                   </Stack>
+                 </Section>
+               </Stack.Item>
+             )}
++>>>>>>> origin/translate