mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] bunch of fixes (#10742)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
545f1fefa5
commit
0448e8c0b2
@@ -325,7 +325,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
|
||||
escaped_humans++
|
||||
if(M.stat != DEAD)
|
||||
surviving_total++
|
||||
if(M_area_type in escape_locations)
|
||||
if(is_path_in_list(M_area_type, escape_locations))
|
||||
escaped_total++
|
||||
|
||||
if(M_area_type == /area/shuttle/escape/centcom)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
@use './colors.scss';
|
||||
|
||||
.window {
|
||||
background-color: black;
|
||||
background-color: white;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
@@ -27,6 +27,7 @@
|
||||
}
|
||||
|
||||
.window-lightMode {
|
||||
background-color: black;
|
||||
background-color: colors.$lightMode;
|
||||
border: 2px solid colors.$lightBorder;
|
||||
}
|
||||
@@ -128,6 +129,7 @@
|
||||
}
|
||||
|
||||
.button {
|
||||
color: white;
|
||||
background-color: colors.$button;
|
||||
border-radius: 0.3rem;
|
||||
border: none;
|
||||
@@ -159,6 +161,7 @@
|
||||
}
|
||||
|
||||
.textarea {
|
||||
color: white;
|
||||
background: transparent;
|
||||
border: none;
|
||||
font-family: inherit;
|
||||
@@ -178,3 +181,7 @@
|
||||
.textarea-large {
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.textarea-lightMode {
|
||||
color: black;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
import { useState } from 'react';
|
||||
import { useBackend } from 'tgui/backend';
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
Input,
|
||||
Section,
|
||||
Stack,
|
||||
Tooltip,
|
||||
} from 'tgui-core/components';
|
||||
import { Box, Button, Input, Section, Stack } from 'tgui-core/components';
|
||||
import { classes } from 'tgui-core/react';
|
||||
|
||||
export const IconSection = (props: {
|
||||
@@ -19,7 +11,6 @@ export const IconSection = (props: {
|
||||
}) => {
|
||||
const { act } = useBackend();
|
||||
const { currentName, mindName, isDefaultName, sprite, size } = props;
|
||||
const [robotName, setRobotName] = useState<string>(currentName);
|
||||
|
||||
return (
|
||||
<Section
|
||||
@@ -39,18 +30,15 @@ export const IconSection = (props: {
|
||||
<Box>Name: </Box>
|
||||
</Stack.Item>
|
||||
<Stack.Item grow>
|
||||
<Tooltip content="Adjust your name">
|
||||
<Input
|
||||
fluid
|
||||
value={robotName}
|
||||
onChange={(value) => {
|
||||
act('rename', { value });
|
||||
setRobotName(value);
|
||||
}}
|
||||
maxLength={52}
|
||||
textColor={isDefaultName ? 'red' : undefined}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Input
|
||||
fluid
|
||||
value={currentName}
|
||||
onChange={(value) => {
|
||||
act('rename', { value });
|
||||
}}
|
||||
maxLength={52}
|
||||
textColor={isDefaultName ? 'red' : undefined}
|
||||
/>
|
||||
</Stack.Item>
|
||||
<Stack.Item>
|
||||
<Button
|
||||
@@ -58,7 +46,6 @@ export const IconSection = (props: {
|
||||
tooltip="Load character slot name"
|
||||
onClick={() => {
|
||||
act('rename', { value: mindName });
|
||||
setRobotName(mindName);
|
||||
}}
|
||||
/>
|
||||
</Stack.Item>
|
||||
|
||||
Reference in New Issue
Block a user