Merge upstream 18.01.2025

[Gaxeer]

Что этот PR делает

Merge upstream 18.01.2025

Summary by Sourcery

Update the plant analyzer to use a TGUI interface, add new features to the hydroponics system, and apply various bug fixes and quality-of-life improvements.

New Features:

• Added a TGUI-based UI for the plant analyzer, replacing the previous chat-based output.

Tests:

• Added unit tests for nearsightedness.

[sourcery-ai]

🧙 Sourcery has finished reviewing your pull request!

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time. You can also use
  this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

We've reviewed this pull request using the Sourcery rules engine.

[github-actions]

This PR causes following conflicts on translate branch:

code/game/objects/items/devices/radio/headset.dm

++<<<<<<< HEAD
 +	if(!(item_flags & IN_INVENTORY) || loc != user)
 +		. += span_notice("A small screen on the headset flashes, it's too small to read without holding or wearing the headset.")
 +		return
 +
 +	// construction of frequency description
 +	var/list/available_channels = list()
 +	available_channels += "<li><b>[span_radio(RADIO_KEY_COMMON)]</b> for the currently tuned frequency</li>"
 +	if(special_channels & RADIO_SPECIAL_BINARY)
 +		available_channels += "<li><b>[span_binarysay(MODE_TOKEN_BINARY)] for [span_binarysay(capitalize(MODE_BINARY))]</b></li>"
 +
 +	for(var/i in 1 to length(channels))
 +		var/channel_name = channels[i]
 +		var/channel_token = GLOB.channel_tokens[channel_name]
 +		var/channel_span_class = get_radio_span(GLOB.radiochannels[channel_name])
 +
 +		if(i == 1)
 +			available_channels += "<li><b>[span_class(channel_span_class, MODE_TOKEN_DEPARTMENT)]</b> or <b>[span_class(channel_span_class, channel_token)]</b> for <b>[span_class(channel_span_class, channel_name)]</b></li>"
 +		else
 +			available_channels += "<li><b>[span_class(channel_span_class, channel_token)]</b> for <b>[span_class(channel_span_class, channel_name)]</b></li>"
 +
 +	. += span_notice("A small screen on the headset displays the following available frequencies:")
 +	. += span_notice("<ul style='display:inline-block; margin: 0; list-style: square;'>[available_channels.Join()]</ul>")
 +
 +	if(command)
 +		. += span_info("<b>Alt-click</b> to toggle the high-volume mode.")
++||||||| 62c8820bf71
++	if(item_flags & IN_INVENTORY && loc == user)
++		// construction of frequency description
++		var/list/avail_chans = list("Use [RADIO_KEY_COMMON] for the currently tuned frequency")
++		if(special_channels & RADIO_SPECIAL_BINARY)
++			avail_chans += "use [MODE_TOKEN_BINARY] for [MODE_BINARY]"
++		if(length(channels))
++			for(var/i in 1 to length(channels))
++				if(i == 1)
++					avail_chans += "use [MODE_TOKEN_DEPARTMENT] or [GLOB.channel_tokens[channels[i]]] for [LOWER_TEXT(channels[i])]"
++				else
++					avail_chans += "use [GLOB.channel_tokens[channels[i]]] for [LOWER_TEXT(channels[i])]"
++		. += span_notice("A small screen on the headset displays the following available frequencies:\n[english_list(avail_chans)].")
++
++		if(command)
++			. += span_info("Alt-click to toggle the high-volume mode.")
++	else
++		. += span_notice("A small screen on the headset flashes, it's too small to read without holding or wearing the headset.")
++=======
+ 	if(item_flags & IN_INVENTORY && loc == user)
+ 		// construction of frequency description
+ 		var/list/avail_chans = list("Используйте [RADIO_KEY_COMMON] для текущей настроенной частоты")
+ 		if(special_channels & RADIO_SPECIAL_BINARY)
+ 			avail_chans += "используйте [MODE_TOKEN_BINARY] для канала \"[MODE_BINARY]\""
+ 		if(length(channels))
+ 			for(var/i in 1 to length(channels))
+ 				if(i == 1)
+ 					avail_chans += "используйте [MODE_TOKEN_DEPARTMENT] или [GLOB.channel_tokens[channels[i]]] для канала \"[LOWER_TEXT(channels[i])]\""
+ 				else
+ 					avail_chans += "используйте [GLOB.channel_tokens[channels[i]]] для канала \"[LOWER_TEXT(channels[i])]\""
+ 		. += span_notice("Маленький экран на дисплее наушника показывает следующие доступные частоты:\n[english_list(avail_chans)].")
+ 
+ 		if(command)
+ 			. += span_info("Альт-Клик для переключения режима повышенной громкости.")
+ 	else
+ 		. += span_notice("Маленький экран на наушнике мигает, но его не разобрать, только если вы не держите или носите наушник.")
++>>>>>>> origin/translate

code/game/objects/items/devices/radio/radio.dm

++<<<<<<< HEAD
 +		. += span_notice("It is set to broadcast over the [span_radio("[frequency/10]")] frequency.")
++||||||| 62c8820bf71
++		. += span_notice("It is set to broadcast over the [frequency/10] frequency.")
++=======
+ 		. += span_notice("Передача настроена на частоту [frequency/10].")
++>>>>>>> origin/translate

code/game/objects/items/storage/lockbox.dm

++<<<<<<< HEAD
 +	if(!silent)
 +		balloon_alert(user, "access denied!")
++||||||| 62c8820bf71
++
++	balloon_alert(user, "access denied!")
++=======
+ 
+ 	balloon_alert(user, "в доступе отказано!")
++>>>>>>> origin/translate

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

++<<<<<<< HEAD
 +	AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean"))
 +	AddComponent(/datum/component/aggro_emote, emote_list = string_list(list("gnashes")))
++||||||| 62c8820bf71
++	AddComponent(/datum/component/aggro_emote, emote_list = string_list(list("gnashes")))
++=======
+ 	AddComponent(/datum/component/aggro_emote, emote_list = string_list(list("скалится")))
++>>>>>>> origin/translate

code/modules/uplink/uplink_items/contractor.dm

++<<<<<<< HEAD
 +	desc = "A reinforcement operative will be sent to aid you in your goals, \
 +		they are paid separately, and will not take a cut from your profits."
++||||||| 62c8820bf71
++	desc = "A reinforecment operative will be sent to aid you in your goals, \
++		they are paid separately, and will not take a cut from your profits."
++=======
+ 	desc = "Подкрепление в виде оперативника будет отправлено для помощи в достижении ваших целей - \
+ 		они оплачиваются отдельно и не отнимают часть вашей прибыли."
++>>>>>>> origin/translate

tgui/packages/tgui/interfaces/ApcControl.jsx

tgui/packages/tgui/interfaces/JobSelection.tsx

++<<<<<<< HEAD
 +};
 +
 +function JobEntry(props: JobEntryProps) {
 +  const { jobName, job, department, onClick } = props;
 +
 +  const jobIcon = JOB2ICON[jobName] || null;
 +
++||||||| 62c8820bf71
++}) => {
++  const jobName = data.jobName;
++  const job = data.job;
++  const department = data.department;
++  const jobIcon = JOB2ICON[jobName] || null;
++=======
+ }) => {
+   const jobName = data.jobName;
+   const job = data.job;
+   const department = data.department;
+   const jobIcon = JOB2ICON[ReverseJobsRu(jobName)] || null;
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +              {shuttle_status && <NoticeBox info>{shuttle_status}</NoticeBox>}
 +              <Box as="span" color="label">
 +                It is currently {round_duration} into the shift.
 +              </Box>
++||||||| 62c8820bf71
++              {data.shuttle_status && (
++                <NoticeBox info>{data.shuttle_status}</NoticeBox>
++              )}
++              <span style={{ color: 'grey' }}>
++                It is currently {data.round_duration} into the shift.
++              </span>
++              <Button
++                style={{ position: 'absolute', right: '1em' }}
++                onClick={() => act('select_job', { job: 'Random' })}
++                content="Random Job!"
++                tooltip="Roll target random job. You can re-roll or cancel your random job if you don't like it."
++              />
++=======
+               {data.shuttle_status && (
+                 <NoticeBox info>{data.shuttle_status}</NoticeBox>
+               )}
+               <span style={{ color: 'grey' }}>
+                 Смена идёт уже: {data.round_duration}.
+               </span>
+               <Button
+                 style={{ position: 'absolute', right: '1em' }}
+                 onClick={() => act('select_job', { job: 'Random' })}
+                 content="Случайная профессия!"
+                 tooltip="Случайно выбрать профессию. Вы можете повторно выбирать случайную профессию или отказаться от этого."
+               />
++>>>>>>> origin/translate
++<<<<<<< HEAD
 +            {Object.entries(departments).map(([name, department]) => (
 +              <DepartmentEntry
 +                key={name}
 +                name={DEPARTMENTS_RU[name] || name}
 +                department={department}
 +              />
 +            ))}
++||||||| 62c8820bf71
++            {Object.entries(departments).map((departmentEntry) => {
++              const departmentName = departmentEntry[0];
++              const entry = departmentEntry[1];
++              return (
++                <Box key={departmentName} minWidth="30%">
++                  <StyleableSection
++                    title={
++                      <>
++                        {DEPARTMENTS_RU[departmentName] || departmentName}
++                        <span
++                          style={{
++                            fontSize: '1rem',
++                            whiteSpace: 'nowrap',
++                            position: 'absolute',
++                            right: '1em',
++                            color: Color.fromHex(entry.color)
++                              .darken(60)
++                              .toString(),
++                          }}
++                        >
++                          {entry.open_slots +
++                            (entry.open_slots === 1 ? ' slot' : ' slots') +
++                            ' available'}
++                        </span>
++                      </>
++                    }
++                    style={{
++                      backgroundColor: entry.color,
++                      marginBottom: '1em',
++                      breakInside: 'avoid-column',
++                    }}
++                    titleStyle={{
++                      'border-bottom-color': Color.fromHex(entry.color)
++                        .darken(50)
++                        .toString(),
++                    }}
++                    textStyle={{
++                      color: Color.fromHex(entry.color).darken(80).toString(),
++                    }}
++                  >
++                    <Stack vertical>
++                      {Object.entries(entry.jobs).map((job) => (
++                        <Stack.Item key={job[0]}>
++                          <JobEntry
++                            key={job[0]}
++                            jobName={job[0]}
++                            job={job[1]}
++                            department={entry}
++                            onClick={() => {
++                              act('select_job', { job: job[0] });
++                            }}
++                          />
++                        </Stack.Item>
++                      ))}
++                    </Stack>
++                  </StyleableSection>
++                </Box>
++              );
++            })}
++=======
+             {Object.entries(departments).map((departmentEntry) => {
+               const departmentName = departmentEntry[0];
+               const entry = departmentEntry[1];
+               return (
+                 <Box key={departmentName} minWidth="30%">
+                   <StyleableSection
+                     title={
+                       <>
+                         {DEPARTMENTS_RU[departmentName] || departmentName}
+                         <span
+                           style={{
+                             fontSize: '1rem',
+                             whiteSpace: 'nowrap',
+                             position: 'absolute',
+                             right: '1em',
+                             color: Color.fromHex(entry.color)
+                               .darken(60)
+                               .toString(),
+                           }}
+                         >
+                           {'позиций доступно: ' + entry.open_slots}
+                         </span>
+                       </>
+                     }
+                     style={{
+                       backgroundColor: entry.color,
+                       marginBottom: '1em',
+                       breakInside: 'avoid-column',
+                     }}
+                     titleStyle={{
+                       'border-bottom-color': Color.fromHex(entry.color)
+                         .darken(50)
+                         .toString(),
+                     }}
+                     textStyle={{
+                       color: Color.fromHex(entry.color).darken(80).toString(),
+                     }}
+                   >
+                     <Stack vertical>
+                       {Object.entries(entry.jobs).map((job) => (
+                         <Stack.Item key={job[0]}>
+                           <JobEntry
+                             key={job[0]}
+                             jobName={job[0]}
+                             job={job[1]}
+                             department={entry}
+                             onClick={() => {
+                               act('select_job', { job: job[0] });
+                             }}
+                           />
+                         </Stack.Item>
+                       ))}
+                     </Stack>
+                   </StyleableSection>
+                 </Box>
+               );
+             })}
++>>>>>>> origin/translate

tgui/packages/tgui/interfaces/NtosDeptOrder.tsx

++<<<<<<< HEAD
 +    (cost >= COST_VERY_LONG_BOUND && 'very long') ||
 +    (cost >= COST_LONG_BOUND && 'long') ||
 +    (cost >= COST_MODERATE_BOUND && 'moderate') ||
 +    'short';
++||||||| 62c8820bf71
++    (cost > COST_UPPER_BOUND * 0.75 && 'long') ||
++    (cost > COST_UPPER_BOUND * 0.25 && 'moderate') ||
++    'short';
++=======
+     (cost > COST_UPPER_BOUND * 0.75 && 'Долгое') ||
+     (cost > COST_UPPER_BOUND * 0.25 && 'Приличное') ||
+     'Короткое';
++>>>>>>> origin/translate