github-actions[bot]
commented
3 months ago This pr causes following conflicts on translate branch:
- code/modules/antagonists/heretic/magic/space_crawl.dm
++<<<<<<< HEAD
++=======
+ our_turf.visible_message(span_warning("[jaunter] погружается в [our_turf]!"))
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ our_turf.visible_message(span_boldwarning("[jaunter] rises out of [our_turf]!"))
++=======
+
+ our_turf.visible_message(span_boldwarning("[jaunter] встаёт из [our_turf]!"))
++>>>>>>> origin/translate
- tgui/packages/tgui/interfaces/Spellbook.tsx
++<<<<<<< HEAD
+ Offensive = 'Offensive',
+ Defensive = 'Defensive',
+ Mobility = 'Mobility',
+ Assistance = 'Assistance',
+ Rituals = 'Rituals',
+ Perks = 'Perks',
++=======
+ Offensive = 'Наступление',
+ Defensive = 'Защита',
+ Mobility = 'Мобильность',
+ Assistance = 'Поддержка',
+ Rituals = 'Ритуалы',
++>>>>>>> origin/translate
++<<<<<<< HEAD
+ disabled={tabIndex === 11}
+ content="Next Page"
++=======
+ disabled={tabIndex === 9}
+ content="Следующая страница"
++>>>>>>> origin/translate
- tgui/packages/tgui/interfaces/Techweb.jsx
++<<<<<<< HEAD
+ <LabeledList>
+ <LabeledList.Item label="Security">
+ <span
+ className={`Techweb__SecProtocol ${
+ !!sec_protocols && 'engaged'
+ }`}
+ >
+ {sec_protocols ? 'Engaged' : 'Disengaged'}
+ </span>
+ </LabeledList.Item>
+ {Object.keys(points).map((k) => (
+ <LabeledList.Item key={k} label="Points">
+ <b>{points[k]}</b>
+ {!!points_last_tick[k] && ` (+${points_last_tick[k]}/sec)`}
+ </LabeledList.Item>
+ ))}
+ <LabeledList.Item label="Queue">
+ {queue_nodes.length !== 0
+ ? Object.keys(queue_nodes).map((node_id) => (
+ <Button
+ key={node_id}
+ tooltip={`Added by: ${queue_nodes[node_id]}`}
+ >
+ {node_cache[node_id].name}
+ </Button>
+ ))
+ : 'Empty'}
+ </LabeledList.Item>
+ </LabeledList>
++=======
+ <Box>
+ Доступные очки:
+ <ul className="Techweb__PointSummary">
+ {Object.keys(points).map((k) => (
+ <li key={k}>
+ <b>{k}</b>: {points[k]}
+ {!!points_last_tick[k] && ` (+${points_last_tick[k]}/sec)`}
+ </li>
+ ))}
+ </ul>
+ </Box>
+ <Box>
+ Протоколы защиты:
+ <span
+ className={`Techweb__SecProtocol ${
+ !!sec_protocols && 'engaged'
+ }`}
+ >
+ {sec_protocols ? 'включены' : 'отключены'}
+ </span>
+ </Box>
++>>>>>>> origin/translate
++<<<<<<< HEAD
++=======
+ {tier > 0 && (
+ <Button
+ icon="lightbulb"
+ disabled={!can_unlock || tier > 1}
+ onClick={() => act('researchNode', { node_id: id })}
+ >
+ Изучить
</Button>
)}
++>>>>>>> origin/translate
About The Pull Request
Merge upstream [16.07.2024]