Merge pull request #4480 from CHOMPStation2/upstream-merge-13233

[MIRROR] GitHub Workflows

.github/ISSUE_TEMPLATE/map_report.md

@@ -0,0 +1,29 @@
+---
+name: Map Bug report
+about: Create a report, specific to any map related things.
+title: '[MAPPING] '
+labels: ['Type: Bug', 'Type: Map']
+assignees: ''
+
+---
+
+<!-- Please DO NOT report 'suggestions' on GitHub. If your issue consists of an opinion about how something should be, it doesn't belong here. -->
+<!-- If your issue consists of something not operating as intended, please report it below by filling out the template. -->
+<!-- These directions will not appear in the issue, when submitted. -->
+
+<!--Please provide a clear and concise description of what the bug is.-->
+#### Brief description of the bug
+
+<!--What normally happens when this occurs? Keep in mind that behavior may be different on other servers.-->
+#### What you expected to happen
+
+<!--Please use as much detail as possible when describing the bug behavior, including any context (things you did before) that might be relevant.-->
+#### What actually happened
+
+<!--Optional, you may remove this section.-->
+#### Code Revision
+- (Found using the "Show Server Revision" verb under the OOC tab.)
+ 
+<!--Optional, you may remove this section.-->
+#### Anything else you may wish to add:
+- (Location if it's a mapping issue, screenshots, sprites, etc.)

tgui/packages/tgui/interfaces/NtosRevelation.tsx

@@ -1,9 +1,15 @@
 import { Section, Button, LabeledList } from '../components';
 import { useBackend } from '../backend';
 import { NtosWindow } from '../layouts';
+import { BooleanLike } from 'common/react';
+
+type Data = {
+  armed: BooleanLike;
+};
 
 export const NtosRevelation = (props, context) => {
-  const { act, data } = useBackend(context);
+  const { act, data } = useBackend<Data>(context);
+  const { armed } = data;
   return (
     <NtosWindow width={400} height={250} theme="syndicate">
       <NtosWindow.Content>
@@ -23,14 +29,14 @@ export const NtosRevelation = (props, context) => {
               label="Payload Status"
               buttons={
                 <Button
-                  content={data.armed ? 'ARMED' : 'DISARMED'}
-                  color={data.armed ? 'bad' : 'average'}
+                  content={armed ? 'ARMED' : 'DISARMED'}
+                  color={armed ? 'bad' : 'average'}
                   onClick={() => act('PRG_arm')}
                 />
               }
             />
           </LabeledList>
-          <Button fluid bold content="ACTIVATE" textAlign="center" color="bad" disabled={!data.armed} />
+          <Button fluid bold content="ACTIVATE" textAlign="center" color="bad" disabled={!armed} />
         </Section>
       </NtosWindow.Content>
     </NtosWindow>

tools/ci/build_tgui.sh

@@ -8,4 +8,5 @@ nvm use $NODE_VERSION
 cd tgui
 chmod +x bin/tgui
 bin/tgui --ci
+yarn tgui:prettier
 cd ..