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

Port Shadowkin #23

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

Port Shadowkin #23

wants to merge 57 commits into from

Commits on Nov 6, 2023

  1. Port PR42 files directly

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    530dcde View commit details
    Browse the repository at this point in the history

  2. Port PR130 changes directly

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    487d34b View commit details
    Browse the repository at this point in the history

  3. Port PR146 changes directly

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    b17ccf7 View commit details
    Browse the repository at this point in the history

  4. Port PR157 changes directly

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    08ea21b View commit details
    Browse the repository at this point in the history

  5. Port PR188 changes directly

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    dab0059 View commit details
    Browse the repository at this point in the history

  6. Port PR189 changes directly

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    45681f1 View commit details
    Browse the repository at this point in the history

  7. Port shadowkin visibility flags

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    20d8546 View commit details
    Browse the repository at this point in the history

  8. Outline fixes and address some upstream refactor conflicts

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    279bda9 View commit details
    Browse the repository at this point in the history

  9. Fix other old refactor conflicts

    @Finket
    Finket committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    4577f38 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Add some shadowkin improvements progress

    @Finket
    Finket committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a9c37e6 View commit details
    Browse the repository at this point in the history

  2. Add more of the shadowkin improvements

    @Finket
    Finket committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    145381a View commit details
    Browse the repository at this point in the history

  3. Revert shadowkin improvements as PR209 is a draft 

    This reverts commit 145381a.
    @Finket
    Finket committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    ad29f04 View commit details
    Browse the repository at this point in the history

  4. Revert "Add some shadowkin improvements progress" 

    This reverts commit a9c37e6.
    @Finket
    Finket committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3da460f View commit details
    Browse the repository at this point in the history

  5. Port over PR218 changes

    @Finket
    Finket committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    d276fb2 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Fix directory name entities typo

    @Finket
    Finket committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    1f13d93 View commit details
    Browse the repository at this point in the history

  2. Add shadowkin ears yml

    @Finket
    Finket committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    937204e View commit details
    Browse the repository at this point in the history

  3. reformatting and codebase change markers 

    I didn't want to do a review...
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    8301021 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Merge branch 'main' of https://github.com/Simple-Station/Parkstation-… 

    …Friendly-Chainsaw into shadowkin
    @Finket
    Finket committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    616accc View commit details
    Browse the repository at this point in the history

  2. Merge commit '8301021ded383099eeff158d6b6fbdd99acc9c03' of https://gi… 

    …thub.com/Simple-Station/Parkstation-Friendly-Chainsaw into shadowkin
    @Finket
    Finket committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6544c37 View commit details
    Browse the repository at this point in the history

  3. Move over to NetEntity

    @Finket
    Finket committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    63b830a View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Merge branch 'master' of https://github.com/Simple-Station/Parkstatio… 

    …n-Friendly-Chainsaw into shadowkin
    @Finket
    Finket committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    a8e404c View commit details
    Browse the repository at this point in the history

  2. Move more sprites over

    @Finket
    Finket committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    024392c View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Fix Wings sprite bug

    @Finket
    Finket committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    fc87717 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Merge branch 'master' into shadowkin

    @Finket
    Finket committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    05fb81f View commit details
    Browse the repository at this point in the history

  2. Fix duplicate wings declaration

    @Finket
    Finket committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    f4bc63e View commit details
    Browse the repository at this point in the history

  3. Fix missing imports

    @Finket
    Finket committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    3bf3545 View commit details
    Browse the repository at this point in the history

  4. Fix missing merge

    @Finket
    Finket committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d5b22e8 View commit details
    Browse the repository at this point in the history

  5. Fix shadowkin actions!

    @Finket
    Finket committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    2902886 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. fix sprite layers

    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    19c1a4b View commit details
    Browse the repository at this point in the history

  2. Accept resources suggestions from review

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    6f6a62e View commit details
    Browse the repository at this point in the history

  3. Undo larger wings sprite additions

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    54044d9 View commit details
    Browse the repository at this point in the history

  4. Clean up code comments a bit

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    7968e08 View commit details
    Browse the repository at this point in the history

  5. Switch to const action prototypes with validators

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    8bb0c80 View commit details
    Browse the repository at this point in the history

  6. Fix rest waking action finally

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    90363d0 View commit details
    Browse the repository at this point in the history

  7. Switch logger errors to debug assertions

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    c691569 View commit details
    Browse the repository at this point in the history

  8. Fix darkswap visibility

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    2a474d7 View commit details
    Browse the repository at this point in the history

  9. Clean SetDarkened to Darkened and UnDarkened functions

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    030c3c8 View commit details
    Browse the repository at this point in the history

  10. Fix action ECS again and fix action removal

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    bd1f7a8 View commit details
    Browse the repository at this point in the history

  11. Address miscellaneous review items

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    24e03df View commit details
    Browse the repository at this point in the history

  12. Give shadowkin lungs so they can breath again

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    f2cbbae View commit details
    Browse the repository at this point in the history

  13. Reenable empathy chat

    @Finket
    Finket committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    e3401d8 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Temporarily remove respirator values and psionic chance

    @Finket
    Finket committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    74d53c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Adjust potentialpsionic value for shadowkin

    @Finket
    Finket committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1ca9a79 View commit details
    Browse the repository at this point in the history

  2. Fix shadowkin accent not capitalizing first letters

    @Finket
    Finket committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    58e1f23 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Remove Finket's grubby mitts from comments that aren't hers 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
    @Finket @DEATHB4DEFEAT
    Finket and DEATHB4DEFEAT committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    bb5d848 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Merge branch 'master' into shadowkin

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d127704 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'shadowkin' of https://github.com/Finket/Parkstation-Fri… 

    …endly-Chainsaw into shadowkin
    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    cd457f3 View commit details
    Browse the repository at this point in the history

  3. Fix some dependency namespaces

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    00e486f View commit details
    Browse the repository at this point in the history

  4. Fix more dependency namespaces

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6482129 View commit details
    Browse the repository at this point in the history

  5. Remove redundant hardsuits.yml

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    65466c8 View commit details
    Browse the repository at this point in the history

  6. Move from SimpleStation14 to Parkstation namespaces

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    bece17e View commit details
    Browse the repository at this point in the history

  7. Fix more namespace issues

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    912e699 View commit details
    Browse the repository at this point in the history

  8. Move texture references to Parkstation namespace

    @Finket
    Finket committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    e6698fe View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Update LocalPlayer to LocalEntity where applicable

    @Finket
    Finket committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    cdf7f1c View commit details
    Browse the repository at this point in the history

  2. Move ForceDarkSwap and ForceTeleport to their relevant power systems

    @Finket
    Finket committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    d07db68 View commit details
    Browse the repository at this point in the history

  3. Pass ShadowKinPowerSystem Blackeye methods to Blackeye system

    @Finket
    Finket committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    fe60220 View commit details
    Browse the repository at this point in the history

  4. Fix YAMLs

    @Finket
    Finket committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    65e73ff View commit details
    Browse the repository at this point in the history