cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] bunch of fixes (#10742)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-04-25 16:36:20 -07:00
committed by GitHub
parent 545f1fefa5
commit 0448e8c0b2
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/game_mode.dm
View File

@@ -325,7 +325,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
escaped_humans++ escaped_humans++
if(M.stat != DEAD) if(M.stat != DEAD)
surviving_total++ surviving_total++
if(M_area_type in escape_locations) if(is_path_in_list(M_area_type, escape_locations))
escaped_total++ escaped_total++
if(M_area_type == /area/shuttle/escape/centcom) if(M_area_type == /area/shuttle/escape/centcom)

9
tgui/packages/tgui-say/styles/styles.scss
View File

@@ -2,7 +2,7 @@
@use './colors.scss'; @use './colors.scss';
.window { .window {
background-color: black; background-color: white;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
@@ -27,6 +27,7 @@
} }
.window-lightMode { .window-lightMode {
background-color: black;
background-color: colors.$lightMode; background-color: colors.$lightMode;
border: 2px solid colors.$lightBorder; border: 2px solid colors.$lightBorder;
} }
@@ -128,6 +129,7 @@
} }
.button { .button {
color: white;
background-color: colors.$button; background-color: colors.$button;
border-radius: 0.3rem; border-radius: 0.3rem;
border: none; border: none;
@@ -159,6 +161,7 @@
} }
.textarea { .textarea {
color: white;
background: transparent; background: transparent;
border: none; border: none;
font-family: inherit; font-family: inherit;
@@ -178,3 +181,7 @@
.textarea-large { .textarea-large {
overflow-y: scroll; overflow-y: scroll;
} }
.textarea-lightMode {
color: black;
}

33
tgui/packages/tgui/interfaces/RobotChoose/IconSection.tsx
View File

@@ -1,13 +1,5 @@
import { useState } from 'react';
import { useBackend } from 'tgui/backend'; import { useBackend } from 'tgui/backend';
import { import { Box, Button, Input, Section, Stack } from 'tgui-core/components';
Box,
Button,
Input,
Section,
Stack,
Tooltip,
} from 'tgui-core/components';
import { classes } from 'tgui-core/react'; import { classes } from 'tgui-core/react';
export const IconSection = (props: { export const IconSection = (props: {
@@ -19,7 +11,6 @@ export const IconSection = (props: {
}) => { }) => {
const { act } = useBackend(); const { act } = useBackend();
const { currentName, mindName, isDefaultName, sprite, size } = props; const { currentName, mindName, isDefaultName, sprite, size } = props;
const [robotName, setRobotName] = useState<string>(currentName);
return ( return (
<Section <Section
@@ -39,18 +30,15 @@ export const IconSection = (props: {
<Box>Name: </Box> <Box>Name: </Box>
</Stack.Item> </Stack.Item>
<Stack.Item grow> <Stack.Item grow>
<Tooltip content="Adjust your name"> <Input
<Input fluid
fluid value={currentName}
value={robotName} onChange={(value) => {
onChange={(value) => { act('rename', { value });
act('rename', { value }); }}
setRobotName(value); maxLength={52}
}} textColor={isDefaultName ? 'red' : undefined}
maxLength={52} />
textColor={isDefaultName ? 'red' : undefined}
/>
</Tooltip>
</Stack.Item> </Stack.Item>
<Stack.Item> <Stack.Item>
<Button <Button
@@ -58,7 +46,6 @@ export const IconSection = (props: {
tooltip="Load character slot name" tooltip="Load character slot name"
onClick={() => { onClick={() => {
act('rename', { value: mindName }); act('rename', { value: mindName });
setRobotName(mindName);
}} }}
/> />
</Stack.Item> </Stack.Item>