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

Upstream Sync #27

Merged
merged 892 commits into from
Jan 16, 2024
Merged

Upstream Sync #27

merged 892 commits into from
Jan 16, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Dec 17, 2023

No description provided.

PJBot and others added 30 commits December 16, 2023 19:23
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Underbelly marking

* Locale
* import narsie sprite

* narsie_rises audio

* rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent

* add AnnounceOnSpawn system

* oop

* NAR'SIE HAS RISEN

* suffix

* base prototype, changes

* fix

* mapinit

* downscale

* new toys

* singuloose

* still not fix

* honki sprite

* add honki spawn animation

* revert spawnondespawn change

* really revert

* use LocId for announceonspawn

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
* guidebook

* like everything else

* increase razorium damage

* nerf a lil bit
…168)

* Add speed penalty for holding hardsuits and duffels

* just inherit from ClothingSpeedModifier

* comment godo
Co-authored-by: deltanedas <@deltanedas:kde.org>
@DEATHB4DEFEAT DEATHB4DEFEAT added Size: 1-Very Large For especially large issues/PRs Priority: 2-High Needs to be resolved as soon as possible labels Dec 17, 2023
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Dec 17, 2023
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 3a57bb9 into master Jan 16, 2024
10 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the upstream-sync branch January 16, 2024 23:02
DEATHB4DEFEAT added a commit that referenced this pull request Mar 28, 2024
# Description

Frees up some runners.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Priority: 2-High Needs to be resolved as soon as possible Size: 1-Very Large For especially large issues/PRs Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.