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

Floofstation Release V2 #340

Merged
merged 36 commits into from
Nov 11, 2024
Merged

Floofstation Release V2 #340

merged 36 commits into from
Nov 11, 2024

Commits on Oct 24, 2024

  1. Botany - Initial commit

    @Memeji
    Memeji committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5f4be71 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. A few changes, meat weat can be used. Seeds added to vendor.

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

Commits on Oct 30, 2024

  1. Merge branch 'Nikko-Master-Unstable' into Nikko-Botany

    @Memeji
    Memeji committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    190001c View commit details
    Browse the repository at this point in the history

  2. Floof Botany update, last changes. Adding to inventories.

    @Memeji
    Memeji committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    36e59b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge branch 'master' into Nikko-Botany

    @Memeji
    Memeji committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    0eea1ef View commit details
    Browse the repository at this point in the history

  2. Fixing some test fail issues

    @Memeji
    Memeji committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    61aebf0 View commit details
    Browse the repository at this point in the history

  3. Frontier modifications

    @Memeji
    Memeji committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    83d0ded View commit details
    Browse the repository at this point in the history

  4. Update Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds… 

    ….yml

Co-authored-by: FoxxoTrystan <[email protected]>
    @Memeji @FoxxoTrystan
    Memeji and FoxxoTrystan authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    73c9f89 View commit details
    Browse the repository at this point in the history

  5. Meat wheat fix

    @Memeji
    Memeji committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    f5556a4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Nikko-Botany' of https://github.com/Memeji/floofstation1 … 

    …into Nikko-Botany
    @Memeji
    Memeji committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    8e813be View commit details
    Browse the repository at this point in the history

  7. Increase cost of seed crates and refill due to selling for more now.

    @Memeji
    Memeji committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    23d6a90 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. NTNF (ERT) 

    A project relating to potential future ERTs and a branch of NanoTrasen dubbed the "NanoTrasen Naval Force" Acts as an ert and a current placeholder for future reworks and implementation. Currently admin spawn only.
    @JasmineRickards
    JasmineRickards committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    694cdee View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. The SESWC Combat boots 

    Adds new combat boots to Sec
    @VividPups
    VividPups committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    4bf9253 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. updates 

    updates
    @VividPups
    VividPups committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    80b15d6 View commit details
    Browse the repository at this point in the history

  2. Updated 

    Updated
    @VividPups
    VividPups committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    fd3f438 View commit details
    Browse the repository at this point in the history

  3. Update Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml 

    Co-authored-by: FoxxoTrystan <[email protected]>
    @VividPups @FoxxoTrystan
    VividPups and FoxxoTrystan authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    7999d80 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Fansana:master' into Nikko-Botany

    @Memeji
    Memeji authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    9975faa View commit details
    Browse the repository at this point in the history

  5. fix test

    @Fansana
    Fansana committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    9562871 View commit details
    Browse the repository at this point in the history

  6. enable cherry pie

    @Fansana
    Fansana committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    36d3983 View commit details
    Browse the repository at this point in the history

  7. Update cargo_botany.yml

    @Memeji
    Memeji authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    d801507 View commit details
    Browse the repository at this point in the history

  8. Update cargo_vending.yml

    @Memeji
    Memeji authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    63d4a63 View commit details
    Browse the repository at this point in the history

  9. Merge pull request Fansana#284 from Memeji/Nikko-Botany 

    Botany - Plant Additions
    @Fansana
    Fansana authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    57097ab View commit details
    Browse the repository at this point in the history

  10. Merge pull request Fansana#334 from JasmineRickards/ert 

    NTNF (ERT)
    @Fansana
    Fansana authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    c3f6de5 View commit details
    Browse the repository at this point in the history

  11. move sprite to floof

    @Fansana
    Fansana committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    27765e9 View commit details
    Browse the repository at this point in the history

  12. fix path and update sprite

    @Fansana
    Fansana committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    9c31277 View commit details
    Browse the repository at this point in the history

  13. update copyright

    @Fansana
    Fansana committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    7a3d414 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Merge pull request Fansana#335 from VividPups/Combat-boots- 

    Combat Boots
    @Fansana
    Fansana authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    982c78f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. Fix Unable to Call Shuttle

    @FoxxoTrystan
    FoxxoTrystan authored Nov 9, 2024
    Configuration menu
    Copy the full SHA
    ee75654 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Fansana:master' into FoxxoTrystan-shuttle-patch

    @FoxxoTrystan
    FoxxoTrystan authored Nov 9, 2024
    Configuration menu
    Copy the full SHA
    108d2ac View commit details
    Browse the repository at this point in the history

  3. Update CommunicationsConsoleSystem.cs

    @FoxxoTrystan
    FoxxoTrystan authored Nov 9, 2024
    Configuration menu
    Copy the full SHA
    53e7942 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Fansana:FoxxoTrystan-shuttle-patch' into FoxxoTrystan-s… 

    …huttle-patch
    @FoxxoTrystan
    FoxxoTrystan authored Nov 9, 2024
    Configuration menu
    Copy the full SHA
    86259a7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request Fansana#338 from FoxxoTrystan/FoxxoTrystan-shuttle… 

    …-patch

Fix Unable to Call Shuttle
    @Fansana
    Fansana authored Nov 9, 2024
    Configuration menu
    Copy the full SHA
    80cb08f View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2024

  1. Update CODEOWNERS

    @FoxxoTrystan
    FoxxoTrystan authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    fd81538 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'stable'

    @FoxxoTrystan
    FoxxoTrystan committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    7ddec31 View commit details
    Browse the repository at this point in the history

  3. Update CODEOWNERS

    @Fansana
    Fansana authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    a05ea2e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. update changelog

    @Fansana
    Fansana committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    99ed774 View commit details
    Browse the repository at this point in the history