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

Food Cart UI rework #22866

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
59725c5
Added food tab to cart UI
Scrambledeggs00 Dec 11, 2024
4adc9ed
Oops
Scrambledeggs00 Dec 11, 2024
6c4beb2
Fixed interaction bug
Scrambledeggs00 Dec 11, 2024
83e69f8
Started on drink tab
Scrambledeggs00 Dec 12, 2024
5cdd029
Added drink capacity element to UI
Scrambledeggs00 Dec 12, 2024
c8211e8
Tooltips and transfer amount
Scrambledeggs00 Dec 12, 2024
7d5f654
Started on transfer and purge UI actions
Scrambledeggs00 Dec 12, 2024
4056ed7
Finished purge and transfer functions
Scrambledeggs00 Dec 13, 2024
5e469d8
Fixed logic error in pour_glass code
Scrambledeggs00 Dec 13, 2024
240ef00
Attempt #1 at fixing drink update bug
Scrambledeggs00 Dec 13, 2024
5c366f9
Fixed drink list update bug
Scrambledeggs00 Dec 13, 2024
3460a9e
Worked on adding progress bar to UI
Scrambledeggs00 Dec 13, 2024
2c610a1
UI changes in drink tab
Scrambledeggs00 Dec 17, 2024
190dc06
Attempts on progress bar
Scrambledeggs00 Dec 17, 2024
c733ad9
StorageStats type now gets storage data
Scrambledeggs00 Dec 17, 2024
331dac7
UI and backend stuff
Scrambledeggs00 Dec 17, 2024
7ca13ff
StorageData related stuff shows again
Scrambledeggs00 Dec 17, 2024
86c68b3
Started attempt of reducing number of functions
Scrambledeggs00 Dec 17, 2024
98fd346
Changed drink tab UI to stacks & removed functions
Scrambledeggs00 Dec 18, 2024
26d64ca
Fixed food UI bug
Scrambledeggs00 Dec 18, 2024
6d098ec
Final tweeks and attempts to make reagents spill
Scrambledeggs00 Dec 19, 2024
be71f2a
Cart now spills liquids when destroyed
Scrambledeggs00 Dec 20, 2024
c7f8307
Fixed Lints TGUI issues
Scrambledeggs00 Dec 20, 2024
78c215c
Gave thanks in comment
Scrambledeggs00 Dec 20, 2024
69ad541
Update code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
Scrambledeggs00 Dec 20, 2024
6e53ae1
hedgehog1029's suggested changes
Scrambledeggs00 Dec 20, 2024
42316d8
Merge branch 'Foodcart-UI' of https://github.com/Scrambledeggs00/Yogs…
Scrambledeggs00 Dec 20, 2024
e631f81
reverts .Add change
Scrambledeggs00 Dec 20, 2024
b8df4be
Fixed #19482 and slight text reformating
Scrambledeggs00 Dec 26, 2024
4eab4e0
autodoc comments support
Scrambledeggs00 Dec 27, 2024
085bd5a
Switched UI image to base64 from hedgehog's code
Scrambledeggs00 Dec 27, 2024
5e37795
Removed commented out UI image code
Scrambledeggs00 Dec 27, 2024
a42ed24
Referenced no react in drink storage tooltips
Scrambledeggs00 Dec 28, 2024
1bc6d78
Update code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
Scrambledeggs00 Jan 2, 2025
ef1957a
Update code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
Scrambledeggs00 Jan 2, 2025
acf3c90
Update code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
Scrambledeggs00 Jan 2, 2025
48f2f7b
baiomu's review changes
Scrambledeggs00 Jan 2, 2025
df1e8f3
Moved usr from pour_glass to ui_act
Scrambledeggs00 Jan 2, 2025
78e1e3f
removed find_amount and replaced with datums
Scrambledeggs00 Jan 3, 2025
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
Loading
Loading