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.

Sign up for GitHub

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

Jump to bottom

Upp req console, tank and cas printers #6988

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open

Upp req console, tank and cas printers #6988

wants to merge 84 commits into from

Commits on Jul 13, 2024

  1. eh

    @uuuuhuuuu
    uuuuhuuuu committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    9676fa0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/cuberound/cmss13

    @uuuuhuuuu
    uuuuhuuuu committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    a184b87 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. ehm

    @uuuuhuuuu
    uuuuhuuuu committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    444b74c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/cuberound/cmss13

    @uuuuhuuuu
    uuuuhuuuu committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    98fa1ae View commit details
    Browse the repository at this point in the history

  3. ehm

    @uuuuhuuuu
    uuuuhuuuu committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2a78285 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'cmss13-devs:master' into master

    @cuberound
    cuberound authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    b412fdb View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge branch 'cmss13-devs:master' into master

    @cuberound
    cuberound authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    d2d0c64 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. Merge branch 'cmss13-devs:master' into master

    @cuberound
    cuberound authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    920c4a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. groundwork begins

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    30b2c7f View commit details
    Browse the repository at this point in the history

  2. okey we cooking

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    6a43ea3 View commit details
    Browse the repository at this point in the history

  3. okey I KNOW THAT NORMAL ELEVATOR DOES NOT WORK but I need to test the… 

    … upp stuff and getting both to work is a LOAD of work
    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    c403150 View commit details
    Browse the repository at this point in the history

  4. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    cddc464 View commit details
    Browse the repository at this point in the history

  5. ehm

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    e7ab536 View commit details
    Browse the repository at this point in the history

  6. Adding basic stuff to UPP req console

    @SerheyKr
    SerheyKr committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    cf6649e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from SerheyKr/Adding-basic-stuff-to-UPP-req-con… 

    …sole

Adding basic stuff to UPP req console
    @cuberound
    cuberound authored Aug 19, 2024
    Configuration menu
    Copy the full SHA
    7bcb0a0 View commit details
    Browse the repository at this point in the history

  8. menu for upp stuff thanks to tex

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    d93b72e View commit details
    Browse the repository at this point in the history

  9. fixes again

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    677b328 View commit details
    Browse the repository at this point in the history

  10. removes random create from upp console

    @uuuuhuuuu
    uuuuhuuuu committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    769220d View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Fixing crate types and some names. Adding circuit for UPP req console… 

    …, some work on UPP req papers and black market
    @SerheyKr
    SerheyKr committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e495da8 View commit details
    Browse the repository at this point in the history

  2. cleanup fix

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    abdc1fd View commit details
    Browse the repository at this point in the history

  3. solves init in nice way

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f09b8d7 View commit details
    Browse the repository at this point in the history

  4. good

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    5ddd21d View commit details
    Browse the repository at this point in the history

  5. removes dupe

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    71e223b View commit details
    Browse the repository at this point in the history

  6. fix

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    1858506 View commit details
    Browse the repository at this point in the history

  7. tabs added to list

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    64bb426 View commit details
    Browse the repository at this point in the history

  8. ehm what is wrong

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    bd9f71a View commit details
    Browse the repository at this point in the history

  9. adds ,

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    aca0349 View commit details
    Browse the repository at this point in the history

  10. whaat

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    248b5e3 View commit details
    Browse the repository at this point in the history

  11. eh?

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e5af819 View commit details
    Browse the repository at this point in the history

  12. aaaa

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    cbf1d5c View commit details
    Browse the repository at this point in the history

  13. god

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    5f66565 View commit details
    Browse the repository at this point in the history

  14. pain

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f9f3133 View commit details
    Browse the repository at this point in the history

  15. aaa

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    3872710 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #6 from SerheyKr/Fixing-crate-types-and-some-names… 

    ….-Adding-circuit-for-UPP-req-console,-some-work-on-UPP-req-papers-and-black-market

Fixing crate types and some names. Adding circuit for UPP req console…
    @cuberound
    cuberound authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    bfd0efb View commit details
    Browse the repository at this point in the history

  17. atempt to solve improper cleanup

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c1feb57 View commit details
    Browse the repository at this point in the history

  18. I hate alphabet

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    1ee30b8 View commit details
    Browse the repository at this point in the history

  19. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    297f7de View commit details
    Browse the repository at this point in the history

  20. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    4500db1 View commit details
    Browse the repository at this point in the history

  21. fuck

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    f220a3b View commit details
    Browse the repository at this point in the history

  22. WORK!

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    099641d View commit details
    Browse the repository at this point in the history

  23. dp part fabricator and tank part fabricator

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    0d39aa0 View commit details
    Browse the repository at this point in the history

  24. uses definde strings

    @uuuuhuuuu
    uuuuhuuuu committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    8e1a08e View commit details
    Browse the repository at this point in the history

  25. Updating UPP crates, some paper stuff

    @SerheyKr
    SerheyKr committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    93ccb24 View commit details
    Browse the repository at this point in the history

  26. Removing black market from UPP req circuit

    @SerheyKr
    SerheyKr committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    1cac616 View commit details
    Browse the repository at this point in the history

  27. Update computer.dm

    @SerheyKr
    SerheyKr committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    5855835 View commit details
    Browse the repository at this point in the history

  28. Update supplyshuttle_upp.dm

    @SerheyKr
    SerheyKr committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    b2bb92f View commit details
    Browse the repository at this point in the history

  29. Creating new order console for UPP and some paper update

    @SerheyKr
    SerheyKr committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e202a55 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #7 from SerheyKr/Updating-UPP-crates,-some-paper-s… 

    …tuff

Updating UPP crates, some paper stuff
    @cuberound
    cuberound authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    7174dd4 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. removes unintended mapping chnages

    @uuuuhuuuu
    uuuuhuuuu committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    17c466c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'UPP-req-console' of https://github.com/cuberound/cmss13 … 

    …into UPP-req-console
    @uuuuhuuuu
    uuuuhuuuu committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8171ba4 View commit details
    Browse the repository at this point in the history

  3. Fixing papers and adding random crate to UPP req

    @SerheyKr
    SerheyKr committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    c1164bc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from SerheyKr/Fixing-papers-and-adding-random-… 

    …crate-to-UPP-req

Fixing papers and adding random crate to UPP req
    @cuberound
    cuberound authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    f9a0be6 View commit details
    Browse the repository at this point in the history

  5. Bug fix

    @SerheyKr
    SerheyKr committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    9139bb9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #12 from SerheyKr/Bug-fix 

    Bug fix
    @cuberound
    cuberound authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    4ba1819 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. UPP req console code refactoring

    @SerheyKr
    SerheyKr committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    8bc3e9e View commit details
    Browse the repository at this point in the history

  2. Little fixes

    @SerheyKr
    SerheyKr committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    f088ee5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13 from SerheyKr/UPP-req-console-code-refactoring 

    UPP req console code refactoring
    @cuberound
    cuberound authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    f983584 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. removes unused iterations from upp supply

    @uuuuhuuuu
    uuuuhuuuu committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    748daa6 View commit details
    Browse the repository at this point in the history

  2. now

    @uuuuhuuuu
    uuuuhuuuu committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    5e1c458 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. working on it

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    742372c View commit details
    Browse the repository at this point in the history

  2. fix

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    20aefb1 View commit details
    Browse the repository at this point in the history

  3. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    9605736 View commit details
    Browse the repository at this point in the history

  4. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    9b692a7 View commit details
    Browse the repository at this point in the history

  5. em

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    e55b5d5 View commit details
    Browse the repository at this point in the history

  6. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    50c882e View commit details
    Browse the repository at this point in the history

  7. missing ,

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    1987965 View commit details
    Browse the repository at this point in the history

  8. removes useless junk

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    7e94a2e View commit details
    Browse the repository at this point in the history

  9. heh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    30c8dca View commit details
    Browse the repository at this point in the history

  10. em

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    a326f21 View commit details
    Browse the repository at this point in the history

  11. cleanup

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    66cfb82 View commit details
    Browse the repository at this point in the history

  12. ehm

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    2fdf73c View commit details
    Browse the repository at this point in the history

  13. eh

    @uuuuhuuuu
    uuuuhuuuu committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    8679367 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Merge branch 'master' into UPP-req-console

    @cuberound
    cuberound authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    e3724bc View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. correctly solves the merge conflct

    @uuuuhuuuu
    uuuuhuuuu committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    d1a7c19 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge branch 'master' into UPP-req-console

    @cuberound
    cuberound authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    4303fbd View commit details
    Browse the repository at this point in the history

  2. mergeconflict fix finished

    @uuuuhuuuu
    uuuuhuuuu committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    25f1ec9 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. fixed whitepsaces and capital in proc

    @uuuuhuuuu
    uuuuhuuuu committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    9e12f47 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Merge branch 'master' into UPP-req-console

    @cuberound
    cuberound authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    12fb0dc View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. none made shuttles into new shuttle code so here we go I quess

    @uuuuhuuuu
    uuuuhuuuu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c2d2ff6 View commit details
    Browse the repository at this point in the history

  2. working elevator

    @uuuuhuuuu
    uuuuhuuuu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    00eb850 View commit details
    Browse the repository at this point in the history

  3. renames areas

    @uuuuhuuuu
    uuuuhuuuu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    238a2af View commit details
    Browse the repository at this point in the history

  4. finishing touch

    @uuuuhuuuu
    uuuuhuuuu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    d4abe28 View commit details
    Browse the repository at this point in the history

  5. finishing touch

    @uuuuhuuuu
    uuuuhuuuu committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c02a961 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Merge branch 'master' into UPP-req-console

    @cuberound
    cuberound authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    bd1049f View commit details
    Browse the repository at this point in the history