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

Cherry-Pick "Shrimp Mob for Metempsychosis (#862)" #882

Merged
merged 6 commits into from
Sep 8, 2024
Merged

Cherry-Pick "Shrimp Mob for Metempsychosis (#862)" #882

merged 6 commits into from
Sep 8, 2024

Commits on Sep 7, 2024

  1. Shrimp Mob for Metempsychosis (Simple-Station#862) 

    * shrinp add

* Update metempsychoticNonHumanoids.yml

fixed typo

* Update Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: leo <[email protected]>

* Update Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: leo <[email protected]>

* Update fun.yml

* Update meta.json

remove ONE SILLY COMMA

---------

Signed-off-by: leo <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: Null <[email protected]>
    @leonardo-dabepis @DEATHB4DEFEAT
    @NullWanderer @Mnemotechnician
    3 people authored and Mnemotechnician committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    caeb017 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into port/shrimp 

    Signed-off-by: Mnemotechnican <[email protected]>
    @Mnemotechnician
    Mnemotechnician authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    4408480 View commit details
    Browse the repository at this point in the history

  3. Increase chance to 1, else it's never gonna be chosen 

    Signed-off-by: Mnemotechnican <[email protected]>
    @Mnemotechnician
    Mnemotechnician authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    8af92b8 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
    @Mnemotechnician @DEATHB4DEFEAT
    Mnemotechnician and DEATHB4DEFEAT authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    6ed6638 View commit details
    Browse the repository at this point in the history

  2. new psionics guh 

    Signed-off-by: Mnemotechnican <[email protected]>
    @Mnemotechnician
    Mnemotechnician authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    62eca89 View commit details
    Browse the repository at this point in the history

  3. Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml 

    Co-authored-by: VMSolidus <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
    @Mnemotechnician @VMSolidus
    Mnemotechnician and VMSolidus authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    68d79ff View commit details
    Browse the repository at this point in the history