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 18 #280

Merged
merged 35 commits into from
Aug 28, 2023
Merged

Upstream merge 18 #280

merged 35 commits into from
Aug 28, 2023

Commits on Aug 26, 2023

  1. Allow ore bags to pickup artifact fragments (space-wizards#19562)

    @liltenhead
    liltenhead authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c6de69e View commit details
    Browse the repository at this point in the history

  2. Automatic changelog update

    @PJBot
    PJBot committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    6def8c8 View commit details
    Browse the repository at this point in the history

  3. Support number of uses starting at zero (space-wizards#19452) 

    This allows peelable bananas without replicating the entire YAML
structure to remove this one component.
    @Partmedia
    Partmedia authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    ccd0e8b View commit details
    Browse the repository at this point in the history

  4. Add peeled state for bananas (space-wizards#19393) 

    Co-authored-by: Kevin Zheng <[email protected]>
    @potato1234x @Partmedia
    potato1234x and Partmedia authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    77711de View commit details
    Browse the repository at this point in the history

  5. Automatic changelog update

    @PJBot
    PJBot committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    b439aad View commit details
    Browse the repository at this point in the history

  6. Meleespeech Action, Holoparasite Meleespeech (space-wizards#19504)

    @HerCoyote23
    HerCoyote23 authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    407d45c View commit details
    Browse the repository at this point in the history

  7. Automatic changelog update

    @PJBot
    PJBot committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    e5ee7c6 View commit details
    Browse the repository at this point in the history

  8. add board container to wallmounts (space-wizards#19565)

    @qwerltaz
    qwerltaz authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    0c58a1e View commit details
    Browse the repository at this point in the history

  9. Automatic changelog update

    @PJBot
    PJBot committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    d3ed36d View commit details
    Browse the repository at this point in the history

  10. Update RobustToolbox to 01546f3 (space-wizards#19569)

    @DrSmugleaf
    DrSmugleaf authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    0bd48a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. Origin Station Update 26.08.2023 (jrpacman, borg roles) (space-wizard… 

    …s#19568)
    @brainfood1183
    brainfood1183 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    8195690 View commit details
    Browse the repository at this point in the history

  2. Remove ActiveLagComp (space-wizards#19572)

    @metalgearsloth
    metalgearsloth authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    33e1514 View commit details
    Browse the repository at this point in the history

  3. Use AllEntityQuery for lagcomp (space-wizards#19574)

    @metalgearsloth
    metalgearsloth authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    b311bf3 View commit details
    Browse the repository at this point in the history

  4. Remove some erroneous compadd subs (space-wizards#19576)

    @metalgearsloth
    metalgearsloth authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    d40f478 View commit details
    Browse the repository at this point in the history

  5. Watchers (space-wizards#19367)

    @mirrorcult
    mirrorcult authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    70e0520 View commit details
    Browse the repository at this point in the history

  6. Add support for custom controls in the character menu (space-wizards#… 

    …19567)
    @EmoGarbage404
    EmoGarbage404 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    3e93e96 View commit details
    Browse the repository at this point in the history

  7. Make bound-UI range checks consistent with interaction. (space-wizard… 

    …s#19461)
    @PJB3005
    PJB3005 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    3a72747 View commit details
    Browse the repository at this point in the history

  8. Automatic changelog update

    @PJBot
    PJBot committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    e6b413f View commit details
    Browse the repository at this point in the history

  9. Run variantize on barratry (space-wizards#19527) 

    * Run variantize on barratry

Also use new asteroid plating tile in sci

* Requested changes
    @TsjipTsjip
    TsjipTsjip authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    e79c39b View commit details
    Browse the repository at this point in the history

  10. Localize wires window title (space-wizards#19577) 

    * Localize wires window title

* Reset
    @Morb0
    Morb0 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    56a49ba View commit details
    Browse the repository at this point in the history

  11. northstar glove 8->7 dmg (space-wizards#19570)

    @HerCoyote23
    HerCoyote23 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    2dad30c View commit details
    Browse the repository at this point in the history

  12. Automatic changelog update

    @PJBot
    PJBot committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    0ec8daa View commit details
    Browse the repository at this point in the history

  13. Projectile and damage events now include the origin (space-wizards#19322 

    )
    @PixelTheKermit
    PixelTheKermit authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    9fef38a View commit details
    Browse the repository at this point in the history

  14. Reduce uplink combat medipen cost (space-wizards#19556)

    @hord-brayden
    hord-brayden authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    f15eb08 View commit details
    Browse the repository at this point in the history

  15. make SpawnItemsOnUseComponent not require sound field (space-wizards#… 

    …19583)

* Update SpawnItemsOnUseComponent.cs

* Update Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs

Co-authored-by: metalgearsloth <[email protected]>

---------

Co-authored-by: metalgearsloth <[email protected]>
    @lzk228 @metalgearsloth
    lzk228 and metalgearsloth authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    43ddd24 View commit details
    Browse the repository at this point in the history

  16. Jr Pacmen around Omega (space-wizards#19587)

    @JustCone14
    JustCone14 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    3c6ccba View commit details
    Browse the repository at this point in the history

  17. fix recycler (space-wizards#19590)

    @EmoGarbage404
    EmoGarbage404 authored Aug 27, 2023
    Configuration menu
    Copy the full SHA
    235da38 View commit details
    Browse the repository at this point in the history

  18. Automatic changelog update

    @PJBot
    PJBot committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    cae28d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Cluster Pacmans (space-wizards#19592)

    @JustCone14
    JustCone14 authored Aug 28, 2023
    Configuration menu
    Copy the full SHA
    29a2f7f View commit details
    Browse the repository at this point in the history

  2. Shift Sec HUD To The Right Side (space-wizards#19597)

    @Nairodian
    Nairodian authored Aug 28, 2023
    Configuration menu
    Copy the full SHA
    f0f920c View commit details
    Browse the repository at this point in the history

  3. Automatic changelog update

    @PJBot
    PJBot committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    38c6b4d View commit details
    Browse the repository at this point in the history

  4. Remove usages of obsolete MetaDataComponent setters (space-wizards#19582 

    )
    @Visne
    Visne authored Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b88c2cb View commit details
    Browse the repository at this point in the history

  5. Improve flavor UI (space-wizards#19600) 

    Co-authored-by: metalgearsloth <[email protected]>
    @Morb0 @metalgearsloth
    Morb0 and metalgearsloth authored Aug 28, 2023
    Configuration menu
    Copy the full SHA
    627a282 View commit details
    Browse the repository at this point in the history

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

    …on-14 into upstream-merge-18
    @TheArturZh
    TheArturZh committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    a7cc008 View commit details
    Browse the repository at this point in the history

  7. Fix photocopier code warnings

    @TheArturZh
    TheArturZh committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    57a46de View commit details
    Browse the repository at this point in the history