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

Latest Experimental Psychics #6

Merged
merged 97 commits into from
Jul 4, 2024

Commits on May 3, 2024

  1. guh

    VMSolidus committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6099c11 View commit details
    Browse the repository at this point in the history
  2. Psionic Refactor pt 1

    VMSolidus committed May 3, 2024
    Configuration menu
    Copy the full SHA
    89d58ed View commit details
    Browse the repository at this point in the history
  3. Last bit

    VMSolidus committed May 3, 2024
    Configuration menu
    Copy the full SHA
    afaedd2 View commit details
    Browse the repository at this point in the history
  4. Last one missed

    VMSolidus committed May 3, 2024
    Configuration menu
    Copy the full SHA
    1566ee5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c832f5f View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Finishing Mind Swap rework

    VMSolidus committed May 14, 2024
    Configuration menu
    Copy the full SHA
    827bdb2 View commit details
    Browse the repository at this point in the history
  2. Noospheric Zap updating

    VMSolidus committed May 14, 2024
    Configuration menu
    Copy the full SHA
    22f405b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    54e7521 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Almost done

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f50f9df View commit details
    Browse the repository at this point in the history
  2. guh

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    834e0eb View commit details
    Browse the repository at this point in the history
  3. More migrations

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    372671e View commit details
    Browse the repository at this point in the history
  4. Final migrations

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f3bc3d8 View commit details
    Browse the repository at this point in the history
  5. Last set of migrations

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    303d1b3 View commit details
    Browse the repository at this point in the history
  6. Update PsionicsSystem.cs

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    62163f0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    83ea6ac View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c569e2e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    851beba View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0597405 View commit details
    Browse the repository at this point in the history
  11. Revert "removing some errant instances of potentialpsionic"

    This reverts commit 0597405.
    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f96847f View commit details
    Browse the repository at this point in the history
  12. Final power update

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0e11da6 View commit details
    Browse the repository at this point in the history
  13. Update psionicPowers.yml

    VMSolidus authored May 15, 2024
    Configuration menu
    Copy the full SHA
    d177e55 View commit details
    Browse the repository at this point in the history
  14. Update psionic.ftl

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    685fc5f View commit details
    Browse the repository at this point in the history
  15. some more small tweaks

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0d37ceb View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    324082a View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    952b7e2 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    1a1c62a View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    d53708c View commit details
    Browse the repository at this point in the history
  20. remove downstream comments

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    e4f387d View commit details
    Browse the repository at this point in the history
  21. Giving pyrokinesis back to ifrit, and setting up base caster stat bon…

    …uses to roundstart casters
    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f5bf4d5 View commit details
    Browse the repository at this point in the history
  22. Update familiars.yml

    VMSolidus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    626f2a5 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Configuration menu
    Copy the full SHA
    c591bc3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4567016 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Configuration menu
    Copy the full SHA
    3584a4e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    15fc457 View commit details
    Browse the repository at this point in the history
  3. Revert "Merge branch 'VMSolidus-Psionic-Power-Refactor'"

    This reverts commit 15fc457, reversing
    changes made to c62f777.
    VMSolidus committed May 29, 2024
    Configuration menu
    Copy the full SHA
    d439c5a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3f44f9d View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into Psionic-Power-Refactor

    Signed-off-by: VMSolidus <[email protected]>
    VMSolidus authored May 29, 2024
    Configuration menu
    Copy the full SHA
    0984fde View commit details
    Browse the repository at this point in the history
  6. aaaaaaaaa

    VMSolidus committed May 29, 2024
    Configuration menu
    Copy the full SHA
    462e91c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6fafc34 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c4db831 View commit details
    Browse the repository at this point in the history
  9. fun pvs fixes

    VMSolidus committed May 29, 2024
    Configuration menu
    Copy the full SHA
    cefe228 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    84e4d10 View commit details
    Browse the repository at this point in the history
  11. Update DispelPowerSystem.cs

    VMSolidus committed May 29, 2024
    Configuration menu
    Copy the full SHA
    c416d40 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'master' into Psionic-Power-Refactor

    Signed-off-by: VMSolidus <[email protected]>
    VMSolidus authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    17c17e9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3fb454 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    36b2409 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c2a20aa View commit details
    Browse the repository at this point in the history
  5. Refactor mime psionics!

    VMSolidus committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    5c5ad44 View commit details
    Browse the repository at this point in the history
  6. Update mime.yml

    VMSolidus committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    efccb49 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Configuration menu
    Copy the full SHA
    c1cbaf9 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. Psionic guidebook update!

    VMSolidus committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    a26be04 View commit details
    Browse the repository at this point in the history
  2. update guidebook

    VMSolidus committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    bf981e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Configuration menu
    Copy the full SHA
    02d528e View commit details
    Browse the repository at this point in the history
  2. Now featuring trait points

    VMSolidus committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    e6e69c0 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Fix fireball bug

    VMSolidus committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    df7a78b View commit details
    Browse the repository at this point in the history
  2. Update LogPowerUsed

    VMSolidus committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    2c49d79 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Configuration menu
    Copy the full SHA
    c4890df View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8e9cd91 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. More updates

    VMSolidus committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    afff078 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Configuration menu
    Copy the full SHA
    d0cb65a View commit details
    Browse the repository at this point in the history
  2. Update GlimmerSystem.cs

    VMSolidus committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    1c4f9e6 View commit details
    Browse the repository at this point in the history
  3. Update GlimmerSystem.cs

    VMSolidus committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    84c1540 View commit details
    Browse the repository at this point in the history
  4. Got this backwards

    VMSolidus committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    c5b0e49 View commit details
    Browse the repository at this point in the history
  5. More glimmer updates

    VMSolidus committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    2ed8c5d View commit details
    Browse the repository at this point in the history
  6. Last one for the night

    VMSolidus committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f87142a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d86df40 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Mirror: StrippableSystem doafter overhaul (Fansana#205)

    ## Mirror of PR #25994: [StrippableSystem doafter
    overhaul](space-wizards/space-station-14#25994)
    from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
    alt="space-wizards" width="22"/>
    [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)
    
    ###### `41ca8f3dfcb986432e1e509247bf239cac137836`
    
    PR opened by <img
    src="https://avatars.githubusercontent.com/u/42424291?v=4"
    width="16"/><a href="https://github.com/Krunklehorn"> Krunklehorn</a> at
    2024-03-11 12:36:28 UTC
    
    ---
    
    PR changed 7 files with 465 additions and 305 deletions.
    
    The PR had the following labels:
    - Status: Needs Review
    
    
    ---
    
    <details open="true"><summary><h1>Original Body</h1></summary>
    
    > ## About the PR
    > 
    > Refactors Strippable DoAfter events to make them synchronous and
    organized.
    > 
    > 
    > ## Technical details
    > 
    > ### Strippable System & Component
    > - Synchronous DoAfters
    > - Made use of `TimeSpan`, `GetStripTimeModifiers()` and `ByRefEvent`
    > - Reorganized checks, removed some redundant ones
    > - Resolve pattern where useful
    > - Added more asserts
    > - Lots of cleanup
    > 
    > The DoAfters were grouped under one event to avoid copy-pasting eight
    separate cancel checks, asserts and function signatures.
    > 
    > Let me know if this is bad for performance and I'll roll them out
    instead.
    > 
    > 
    > ## Media
    > 
    > - [x] I have added screenshots/videos to this PR showcasing its
    changes ingame, **or** this PR does not require an ingame showcase
    > 
    > 
    > ## Breaking changes
    > 
    > ### TimeSpans
    > `ThievingComponent`, `InventoryTemplatePrototype` and
    `ToggleableClothingSystem` use `TimeSpan` in places where they intersect
    with `StrippableComponent`.
    > 
    > 
    > **Changelog**
    > 
    > N/A
    > 
    
    
    </details>
    
    Signed-off-by: VMSolidus <[email protected]>
    Co-authored-by: SimpleStation14 <Unknown>
    Co-authored-by: VMSolidus <[email protected]>
    SimpleStation14 and VMSolidus authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    89a6bb3 View commit details
    Browse the repository at this point in the history
  2. Make Spent Casing Ejection Not Suck (#478)

    # Description
    
    Part of #467, #460, and #474
    
    This is a small PR that corrects a math error in SharedGunSystem,
    causing shell casings to be "Thrown" directly downwards instead of in an
    actually cinematic and exciting arc. While I'm at it, I also corrected
    the fixture of base shell casings to favor "Bounciness", and decreased
    its mass to approximately 100 grams. Finally, I added a sound for when
    casings bounce off of walls, which wasn't present before.
    
    
    https://github.com/Simple-Station/Einstein-Engines/assets/16548818/56bb4ecc-d5eb-4b36-853b-42f05374150d
    
    🆑
    - fix: Spent bullet casings now fly away from a shooter in a cinematic
    manner, rather than fall at their feet.
    
    Co-authored-by: Danger Revolution! <[email protected]>
    VMSolidus and DangerRevolution authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    ba2d538 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2e712c0 View commit details
    Browse the repository at this point in the history
  4. New glimmer functions

    VMSolidus committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    8bbcafa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c8e0572 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    35eb6f6 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Removing the single power requirement

    We now have a glimmer system that can accommodate and account for lots of psychics with multiple powers.
    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    631a4bf View commit details
    Browse the repository at this point in the history
  2. Ye

    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    2f2f658 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7c7ab3f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    10ea788 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8e9afa0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    44e29dd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    864ba53 View commit details
    Browse the repository at this point in the history
  8. Don't look at this please.

    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    d461f4f View commit details
    Browse the repository at this point in the history
  9. First attempt at the error

    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    4752115 View commit details
    Browse the repository at this point in the history
  10. Trying this

    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    10803e1 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7b89ce1 View commit details
    Browse the repository at this point in the history
  12. Fix Loadouts Breaking when You Spend All Your Points (#506)

    <!--
    This is a semi-strict format, you can add/remove sections as needed but
    the order/format should be kept the same
    Remove these comments before submitting
    -->
    
    # Description
    <!--
    Explain this PR in as much detail as applicable
    
    Some example prompts to consider:
    How might this affect the game? The codebase?
    What might be some alternatives to this?
    How/Who does this benefit/hurt [the game/codebase]?
    -->
    
    Self explanatory
    
    P.S. i genuinely dont know what the fuck i did, who wrote this?
    
    # TODO
    
    <!--
    A list of everything you have to do before this PR is "complete"
    You probably won't have to complete everything before merging but it's
    good to leave future references
    -->
    
    - [X] Fix shit
    
    # Media
    
    https://youtu.be/hbJbd5SgZ54
    
    # Changelog
    
    <!--
    You can add an author after the `:cl:` to change the name that appears
    in the changelog (ex: `:cl: Death`)
    Leaving it blank will default to your GitHub display name
    This includes all available types for the changelog
    -->
    
    :cl:
    - fix: Fixed loadouts becoming uneditable after spending all your points
    WarMechanic authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    606a28d View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0d0dd4c View commit details
    Browse the repository at this point in the history
  14. Revert "Trying this"

    This reverts commit 10803e1.
    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    eaacdea View commit details
    Browse the repository at this point in the history
  15. Revert "First attempt at the error"

    This reverts commit 4752115.
    VMSolidus committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    5fc1ce8 View commit details
    Browse the repository at this point in the history
  16. Unflip Hands for Felinid, Vulpkanin, Harpy (#503)

    # Description
    Cherry-picks DeltaV-Station/Delta-v#1194
    
    This is a minor issue in the yml files of custom species that will
    become a problem if we ever merge wizden's better hand indicators.
    
    This PR shouldn't require a preview; all credit goes to the original
    author of the fix.
    
    ---
    
    # Changelog
    Too minor for a cl. Or as some say, no cl no fun.
    
    Co-authored-by: Angelo Fallaria <[email protected]>
    Mnemotechnician and angelofallars authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    ffb9ec9 View commit details
    Browse the repository at this point in the history
  17. Cherry-Pick the Secwatch Pda App (#502)

    # Description
    Cherry-picks DeltaV-Station/Delta-v#1237
    
    All credit goes to the original author, deltanedas
    
    Adds a PDA app that lets seccies know who's wanted and who's about to be
    thrown out of an airlock without relying on the sechud and people having
    their IDs on them.
    
    # Media
    
    
    ![image](https://github.com/Simple-Station/Einstein-Engines/assets/69920617/37f5fa1a-27a5-4392-b4bb-be0f1016b499)
    
    (see the original PR for a better preview)
    
    # Changelog
    
    :cl: deltanedas
    - add: Security can find the new SecWatch™ app in their PDAs to see
    current suspects and wanted criminals.
    
    Co-authored-by: deltanedas <[email protected]>
    Co-authored-by: Azzy <[email protected]>
    3 people authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    7a12461 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    2dcab4d View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Fix Clothing Quick-Equip (#507)

    # Description
    For some reason, ClothingSystem.TryEquip would return false if there's a
    do-after to equip the clothing. This had caused all quick-equip attempts
    on SMALL ITEMS to fail and ended up with every SMALL clothing item being
    equipped into one of the pocket slots (which have no equip delays).
    
    Also fixes quick swap - see the comments below.
    
    # Changelog
    
    :cl:
    - fix: Equipping clothing using the Z key works correctly again.
    Mnemotechnician authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2e8e56f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6aaf466 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Revert "Don't look at this please."

    This reverts commit d461f4f.
    VMSolidus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    8897a4b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8a0ee56 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'ee-personal/Psionic-Power-Refactor' int…

    …o latest-experimental-psychics
    VMSolidus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    5b820b2 View commit details
    Browse the repository at this point in the history
  4. Revert "Merge branch 'Simple-Station:master' into Psionic-Power-Refac…

    …tor"
    
    This reverts commit 8a0ee56, reversing
    changes made to 8897a4b.
    VMSolidus committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    2f3ee29 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    23059a8 View commit details
    Browse the repository at this point in the history