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

Almayer control console tgui #4066

Merged
merged 8 commits into from
Aug 3, 2023

Conversation

stanalbatross
Copy link
Contributor

@stanalbatross stanalbatross commented Jul 31, 2023

About the pull request

image
also majorly cleaned up almayer command console code

Explain why it's good for the game

tgui is good

Changelog

🆑
ui: changed the almayer control console from html to tgui
fix: custom faction messages will now be named properly in the paper printed out from the almayer control console
/:cl:

Stan_Albatross added 2 commits July 31, 2023 15:14
@github-actions github-actions bot added UI deletes nanoui/html Fix Fix one bug, make ten more labels Jul 31, 2023
code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/AlmayerControl.js Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/AlmayerControl.js Outdated Show resolved Hide resolved
code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft August 1, 2023 17:53
@stanalbatross stanalbatross marked this pull request as ready for review August 1, 2023 20:03
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gonna give it a quick tm

code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
code/game/machinery/computer/almayer_control.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft August 3, 2023 16:56
@harryob harryob added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Aug 3, 2023
@stanalbatross stanalbatross marked this pull request as ready for review August 3, 2023 20:21
@harryob harryob enabled auto-merge August 3, 2023 21:04
@harryob harryob added this pull request to the merge queue Aug 3, 2023
Merged via the queue into cmss13-devs:master with commit 327057e Aug 3, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants