Skip to content

Commit

Permalink
Fixes tgui kitchensink and singularity hammer (#972)
Browse files Browse the repository at this point in the history
* node&yarn

* module updates

* sonarjs

* eslint&prettier

* highest TS we can use

* built in now

* reeeee

* added required dep

* fixes kitchensink and shammer
  • Loading branch information
jlsnow301 authored Jun 5, 2024
1 parent 2006fa2 commit 674fd30
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/game/objects/items/singularityhammer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
slot_flags = ITEM_SLOT_BACK

force = 5
force_wielded = type::force * 4
force_wielded = 20
throwforce = 15
throw_range = 1

Expand Down Expand Up @@ -80,7 +80,7 @@
slot_flags = ITEM_SLOT_BACK

force = 5
force_wielded = type::force * 5
force_wielded = 25
throwforce = 30
throw_range = 7

Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/components/Blink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ export class Blink extends Component {
clearTimeout(this.timer);
}

render(props) {
render() {
return (
<span
style={{
visibility: this.state.hidden ? 'hidden' : 'visible',
}}
>
{props.children}
{this.props.children}
</span>
);
}
Expand Down
3 changes: 2 additions & 1 deletion tgui/packages/tgui/debug/KitchenSink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useLocalState } from '../backend';
import { Flex, Section, Tabs } from '../components';
import { Pane, Window } from '../layouts';

const r = require.context('../stories', false, /\.stories\.js$/);
const r = require.context('../stories', false, /\.stories\.jsx$/);

/**
* @returns {{
Expand All @@ -27,6 +27,7 @@ export const KitchenSink = (props) => {
const stories = getStories();
const story = stories[pageIndex];
const Layout = panel ? Pane : Window;

return (
<Layout title="Kitchen Sink" width={600} height={500} theme={theme}>
<Flex height="100%">
Expand Down

0 comments on commit 674fd30

Please sign in to comment.