Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tgooey Restyle #969

Draft
wants to merge 30 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f7c0685
progress
Kapu1178 Jun 3, 2024
a7a78db
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jun 3, 2024
814bb77
tweaks
Kapu1178 Jun 3, 2024
6b3855e
fix buttons
Kapu1178 Jun 3, 2024
e7a354b
fix dropdowns
Kapu1178 Jun 3, 2024
c88f144
Fixes: Table cell size, table borders, coloration of a couple things
Kapu1178 Jun 3, 2024
2f9f902
disabled buttons are grey
Kapu1178 Jun 3, 2024
0836880
Fix phantom scrollable and disabled button color
Kapu1178 Jun 3, 2024
00cf3ff
apc style tweaks
Kapu1178 Jun 3, 2024
197127e
fixes
Kapu1178 Jun 3, 2024
abb0dcd
lots of tweaks
Kapu1178 Jun 4, 2024
16eccdc
improvements
Kapu1178 Jun 4, 2024
11647e9
mostly ntos theming
Kapu1178 Jun 4, 2024
e7070c7
thinkDOS
Kapu1178 Jun 4, 2024
d737e36
copyright thinktronic
Kapu1178 Jun 4, 2024
d01eb57
NTos > thinkdos
Kapu1178 Jun 4, 2024
8d98137
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jun 4, 2024
c9afe58
Merge branch 'master' into tgooey
Kapu1178 Jun 4, 2024
5a91c5d
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jun 17, 2024
30ff4f3
Fixes
Kapu1178 Jun 18, 2024
d577608
lots of crt fits
Kapu1178 Jun 18, 2024
33611fd
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jun 18, 2024
f145d95
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jun 24, 2024
a163250
ntos -> crtntos
Kapu1178 Jun 24, 2024
e29e27c
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jun 27, 2024
f2a80f4
fixes
Kapu1178 Jun 27, 2024
8ff50a8
import usebackend
Kapu1178 Jul 5, 2024
6e64edf
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Jul 20, 2024
ca1f11c
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into tg…
Kapu1178 Oct 26, 2024
7f0d7dc
Merge branch 'master' into tgooey
Kapu1178 Oct 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/modular_computer.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define PDA_DEFAULT_THEME "crtntos"
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/ai/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
if(deployed_shell)
. += "The wireless networking light is blinking.\n"
else if (!shunted && !client)
. += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
. += "[src]Core.exe has stopped responding! ThinkDOS is searching for a solution to the problem...\n"
//. += "*---------*</span>" PARIAH EDIT REMOVAL

. += ..()
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/robot/robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
modularInterface.icon_state_powered = "tablet-silicon-syndicate"
modularInterface.icon_state_unpowered = "tablet-silicon-syndicate"
else
modularInterface.device_theme = "ntos"
modularInterface.device_theme = PDA_DEFAULT_THEME
modularInterface.icon_state = "tablet-silicon"
modularInterface.icon_state_powered = "tablet-silicon"
modularInterface.icon_state_unpowered = "tablet-silicon"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mod/mod_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/// Looks of the MOD.
var/skin = "standard"
/// Theme of the MOD TGUI
var/ui_theme = "ntos"
var/ui_theme = PDA_DEFAULT_THEME
/// If the suit is deployed and turned on.
var/active = FALSE
/// If the suit wire/module hatch is open.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mod/mod_theme.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
/// How long this MOD takes each part to seal.
var/activation_step_time = MOD_ACTIVATION_STEP_TIME
/// Theme used by the MOD TGUI.
var/ui_theme = "ntos"
var/ui_theme = PDA_DEFAULT_THEME
/// List of inbuilt modules. These are different from the pre-equipped suits, you should mainly use these for unremovable modules with 0 complexity.
var/list/inbuilt_modules = list()
/// Modules blacklisted from the MOD.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/modular_computers/computers/item/computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar
var/upgradable = TRUE // whether or not the computer can be upgraded
var/deconstructable = TRUE // whether or not the computer can be deconstructed
var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
var/device_theme = PDA_DEFAULT_THEME // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
var/datum/computer_file/program/active_program = null // A currently active program running on the computer.
var/hardware_flag = 0 // A flag that describes this device type
var/last_power_usage = 0
Expand Down
2 changes: 1 addition & 1 deletion code/modules/modular_computers/computers/item/tablet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
var/obj/item/insert_type = /obj/item/pen
var/obj/item/inserted_item

var/note = "Congratulations on your station upgrading to the new NtOS and Thinktronic based collaboration effort, bringing you the best in electronics and software since 2467!" // the note used by the notekeeping app, stored here for convenience
var/note = "Congratulations on your new ThinkTronic Personal Digital Assistant." // the note used by the notekeeping app, stored here for convenience

/obj/item/modular_computer/tablet/Destroy()
QDEL_NULL(inserted_item)
Expand Down
1 change: 1 addition & 0 deletions daedalus.dme
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
#include "code\__DEFINES\mob_spawn.dm"
#include "code\__DEFINES\mobs.dm"
#include "code\__DEFINES\mod.dm"
#include "code\__DEFINES\modular_computer.dm"
#include "code\__DEFINES\monkeys.dm"
#include "code\__DEFINES\move_force.dm"
#include "code\__DEFINES\movement.dm"
Expand Down
4 changes: 4 additions & 0 deletions tgui/packages/tgui/components/Button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export const Button = (props) => {
const {
className,
fluid,
verticalFluid,
buttonList,
icon,
iconRotation,
iconSpin,
Expand Down Expand Up @@ -52,6 +54,8 @@ export const Button = (props) => {
className={classes([
'Button',
fluid && 'Button--fluid',
verticalFluid && 'Button--verticalFluid',
buttonList && 'Button--buttonList',
disabled && 'Button--disabled',
selected && 'Button--selected',
hasContent && 'Button--hasContent',
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/components/LabeledList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const LabeledListItem = (props: LabeledListItemProps) => {
buttons,
content,
children,
verticalAlign = 'baseline',
verticalAlign = 'middle',
} = props;
return (
<tr className={classes(['LabeledList__row', className])}>
Expand Down
4 changes: 4 additions & 0 deletions tgui/packages/tgui/components/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { BoxProps, computeBoxClassName, computeBoxProps } from './Box';
interface SectionProps extends BoxProps {
buttons?: ReactNode;
className?: string;
// Property used to cleanly hide the borders of tables using the crt theme
crtFitted?: boolean;
fill?: boolean;
fitted?: boolean;
/** @deprecated This property no longer works, please remove it. */
Expand Down Expand Up @@ -52,6 +54,7 @@ export class Section extends Component<SectionProps> {
buttons,
fill,
fitted,
crtFitted,
scrollable,
children,
...rest
Expand All @@ -63,6 +66,7 @@ export class Section extends Component<SectionProps> {
'Section',
fill && 'Section--fill',
fitted && 'Section--fitted',
!fitted && crtFitted && 'Section--crtfitted',
scrollable && 'Section--scrollable',
className,
computeBoxClassName(rest),
Expand Down
3 changes: 2 additions & 1 deletion tgui/packages/tgui/components/Table.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ export const TableRow = (props) => {
};

export const TableCell = (props) => {
const { className, collapsing, header, ...rest } = props;
const { className, collapsing, header, fluid, ...rest } = props;
return (
<td
className={classes([
'Table__cell',
collapsing && 'Table__cell--collapsing',
header && 'Table__cell--header',
fluid && 'Table__cell--fluid',
className,
computeBoxClassName(props),
])}
Expand Down
1 change: 1 addition & 0 deletions tgui/packages/tgui/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import './styles/themes/cardtable.scss';
import './styles/themes/crt/crt-blue.scss';
import './styles/themes/crt/crt-green.scss';
import './styles/themes/crt/crt-yellow.scss';
import './styles/themes/crt/crt-ntos.scss';
import './styles/themes/spookyconsole.scss';
import './styles/themes/flock.scss';
import './styles/themes/hackerman.scss';
Expand Down
25 changes: 22 additions & 3 deletions tgui/packages/tgui/interfaces/AiAirlock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@ export const AiAirlock = (props) => {
const statusBackup = dangerMap[data.power.backup] || dangerMap[0];
const statusElectrify = dangerMap[data.shock] || dangerMap[0];
return (
<Window width={500} height={390}>
<Window width={500} height={505}>
<Window.Content>
<Section title="Power Status">
<Section title="Power Status" crtFitted>
<LabeledList>
<LabeledList.Item
label="Main"
color={statusMain.color}
buttons={
<Button
verticalFluid
icon="lightbulb-o"
disabled={!data.power.main}
content="Disrupt"
Expand All @@ -50,6 +51,7 @@ export const AiAirlock = (props) => {
color={statusBackup.color}
buttons={
<Button
verticalFluid
icon="lightbulb-o"
disabled={!data.power.backup}
content="Disrupt"
Expand All @@ -69,18 +71,21 @@ export const AiAirlock = (props) => {
buttons={
<>
<Button
fluid
icon="wrench"
disabled={!(data.wires.shock && data.shock === 0)}
content="Restore"
onClick={() => act('shock-restore')}
/>
<Button
fluid
icon="bolt"
disabled={!data.wires.shock}
content="Temporary"
onClick={() => act('shock-temp')}
/>
<Button
fluid
icon="bolt"
disabled={!data.wires.shock}
content="Permanent"
Expand All @@ -96,13 +101,15 @@ export const AiAirlock = (props) => {
</LabeledList.Item>
</LabeledList>
</Section>
<Section title="Access and Door Control">
<Section title="Access and Door Control" crtFitted>
<LabeledList>
<LabeledList.Item
label="ID Scan"
color="bad"
buttons={
<Button
fluid
verticalFluid
icon={data.id_scanner ? 'power-off' : 'times'}
content={data.id_scanner ? 'Enabled' : 'Disabled'}
selected={data.id_scanner}
Expand All @@ -117,6 +124,8 @@ export const AiAirlock = (props) => {
label="Emergency Access"
buttons={
<Button
fluid
verticalFluid
icon={data.emergency ? 'power-off' : 'times'}
content={data.emergency ? 'Enabled' : 'Disabled'}
selected={data.emergency}
Expand All @@ -130,6 +139,8 @@ export const AiAirlock = (props) => {
color="bad"
buttons={
<Button
fluid
verticalFluid
icon={data.locked ? 'lock' : 'unlock'}
content={data.locked ? 'Lowered' : 'Raised'}
selected={data.locked}
Expand All @@ -145,6 +156,8 @@ export const AiAirlock = (props) => {
color="bad"
buttons={
<Button
fluid
verticalFluid
icon={data.lights ? 'power-off' : 'times'}
content={data.lights ? 'Enabled' : 'Disabled'}
selected={data.lights}
Expand All @@ -160,6 +173,8 @@ export const AiAirlock = (props) => {
color="bad"
buttons={
<Button
fluid
verticalFluid
icon={data.safe ? 'power-off' : 'times'}
content={data.safe ? 'Enabled' : 'Disabled'}
selected={data.safe}
Expand All @@ -175,6 +190,8 @@ export const AiAirlock = (props) => {
color="bad"
buttons={
<Button
fluid
verticalFluid
icon={data.speed ? 'power-off' : 'times'}
content={data.speed ? 'Enabled' : 'Disabled'}
selected={data.speed}
Expand All @@ -191,6 +208,8 @@ export const AiAirlock = (props) => {
color="bad"
buttons={
<Button
fluid
verticalFluid
icon={data.opened ? 'sign-out-alt' : 'sign-in-alt'}
content={data.opened ? 'Open' : 'Closed'}
selected={data.opened}
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/interfaces/AirAlarm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const AirAlarm = (props) => {
const { act, data } = useBackend();
const locked = data.locked && !data.siliconUser;
return (
<Window width={440} height={650}>
<Window width={440} height={670}>
<Window.Content scrollable>
<InterfaceLockNoticeBox />
<ThermostatControl />
Expand Down Expand Up @@ -52,7 +52,7 @@ const AirAlarmStatus = (props) => {
};
const localStatus = dangerMap[data.danger_level] || dangerMap[0];
return (
<Section title="Air Status">
<Section title="Air Status" crtFitted>
<LabeledList>
{(entries.length > 0 && (
<>
Expand Down Expand Up @@ -127,7 +127,7 @@ const ThermostatControl = (props) => {
fluid
position="absolute"
top="16px"
right="-20px"
right="-28px"
color="transparent"
icon="undo"
onClick={() =>
Expand Down
Loading
Loading