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

Upstream merge #404

Merged
merged 10 commits into from
Oct 3, 2024
Merged

Upstream merge #404

merged 10 commits into from
Oct 3, 2024

Commits on Oct 3, 2024

  1. Fix borg hands showing up in stripping menu (space-wizards#32606) 

    * Fix borg hands showing up in stripping menu

Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out.

* Add more checks
    @PJB3005
    PJB3005 authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    2d64409 View commit details
    Browse the repository at this point in the history

  2. Automatic changelog update

    @PJBot
    PJBot committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    052d7c4 View commit details
    Browse the repository at this point in the history

  3. Various item contraband fixes (space-wizards#32614) 

    * fixes current contraband issues: xray cannon, hos's trench coats, stinger grenades

* yet another contraband addition
    @ArtisticRoomba
    ArtisticRoomba authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    c68e5a6 View commit details
    Browse the repository at this point in the history

  4. Automatic changelog update

    @PJBot
    PJBot committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    3e85d28 View commit details
    Browse the repository at this point in the history

  5. Remove sentience from clean and medi bot (space-wizards#32383) 

    There is no point in these silicon being sentient, they have basically zero role play potential and are not meant to be controlled by players. The janibot can be played somewhat but at that point we have janitor borgs which are way better at this. You can only clean floors and even then it does a terrible job at doing that and only that. A player playing as a janibot will get bored quickly. No amount of RP will save you.

A player taking over a mediborg just makes it useless as you cant inject anymore. And again, medical borg. There's no point in adding the feature. It's too much work then its worth when we have borgs.

They don't have ghost role info for a reason. They are not meant to be played.
    @VasilisThePikachu
    VasilisThePikachu authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    bc76cd8 View commit details
    Browse the repository at this point in the history

  6. Automatic changelog update

    @PJBot
    PJBot committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    568fb23 View commit details
    Browse the repository at this point in the history

  7. Allow users to drag-reorder action bar (space-wizards#32552) 

    * Avoid rebuilding all buttons on action state change

Allows for drag events to continue when actions change

* Remove excess action buttons

---------

Co-authored-by: Eoin Mcloughlin <[email protected]>
    @eoineoineoin
    eoineoineoin and Eoin Mcloughlin authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    a8982b8 View commit details
    Browse the repository at this point in the history

  8. Automatic changelog update

    @PJBot
    PJBot committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    1c41d33 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/space-wizards/space-stati… 

    …on-14 into dev
    @formlessnameless
    formlessnameless committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    0198ca9 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'impstation:master' into dev

    @formlessnameless
    formlessnameless authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    6967b70 View commit details
    Browse the repository at this point in the history