Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
MosleyTheMalO committed Oct 8, 2024
1 parent a55e4a9 commit fe54fd6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1229,9 +1229,9 @@
if(obj_integrity < max_integrity)
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("[user] чинит шлюз сваркой.", \
"<span class='notice'>Вы начинаете чинить шлюз...</span>", \
"<span class='italics'>Вы слышите звук сварки.</span>")
user.visible_message("[user] is welding the airlock.", \
"<span class='notice'>You begin repairing the airlock...</span>", \
"<span class='italics'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
obj_integrity = max_integrity
machine_stat &= ~BROKEN
Expand Down
1 change: 1 addition & 0 deletions tgui/packages/tgui-panel/audio/NowPlayingWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { toFixed } from 'common/math';
import { useDispatch, useSelector } from 'common/redux';
import { Button, Collapsible, Flex, Knob } from 'tgui/components';

import { useSettings } from '../settings';
import { selectAudio } from './selectors';

Expand Down
5 changes: 2 additions & 3 deletions tgui/packages/tgui/interfaces/EmotePanel.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { useLocalState } from '../backend';

import { BooleanLike } from '../../common/react';
import { capitalize } from '../../common/string';
import { useLocalState } from '../backend';
import { useBackend } from '../backend';
import { Box, Button, Flex, Icon, Section } from '../components';
import { Window } from '../layouts';
Expand Down Expand Up @@ -150,7 +149,7 @@ export const EmotePanelContent = (props, context) => {
.sort((a, b) => (a.name > b.name ? 1 : -1))
.map((emote) => (
<Button
width={showIcons ? 16 : 12 }
width={showIcons ? 16 : 12}
key={emote.name}
tooltip={
showIcons ? undefined : (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useBackend } from '../../backend';
import { BlockQuote, Button, Icon, ProgressBar, Section, Stack, Slider, Tooltip } from '../../components';
import { BlockQuote, Button, Icon, ProgressBar, Section, Slider, Stack, Tooltip } from '../../components';

type HeaderInfo = {
isTargetSelf: boolean;
Expand Down
7 changes: 4 additions & 3 deletions tgui/packages/tgui/interfaces/Techweb.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { filter, map, sortBy } from 'common/collections';
import { flow } from 'common/fp';

import { useBackend, useLocalState } from '../backend';
import { Button, Section, Modal, Dropdown, Tabs, Box, Input, Flex, ProgressBar, Collapsible, Icon, Divider } from '../components';
import { Window, NtosWindow } from '../layouts';
import { Box, Button, Divider, Dropdown, Flex, Input, Modal, ProgressBar, Section, Tabs } from '../components';
import { NtosWindow, Window } from '../layouts';

// Data reshaping / ingestion (thanks stylemistake for the help, very cool!)
// This is primarily necessary due to measures that are taken to reduce the size
Expand Down Expand Up @@ -770,7 +771,7 @@ const TechNode = (props, context) => {
{tier !== 0 && !!compact && !destructive && (
<Flex className="Techweb__NodeProgress">
{!!costs && Object.keys(costs).map(key => {
const cost = costs[key]
const cost = costs[key];
const reqPts = Math.max(0, cost);
const nodeProg = Math.min(reqPts, points[key]) || 0;
return (
Expand Down

0 comments on commit fe54fd6

Please sign in to comment.