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 #555

Merged
merged 30 commits into from
Apr 7, 2024
Merged

Upstream sync #555

merged 30 commits into from
Apr 7, 2024

Conversation

Rxup
Copy link
Owner

@Rxup Rxup commented Apr 7, 2024

No description provided.

osjarw and others added 30 commits April 5, 2024 00:01
… component boolean. (#26734)

* Update DamagePopupSystem.cs

* Update DamagePopupSystem.cs

* Add ability to allow or deny type change via component bool
Update CCVars.cs

* Fixes one file format inconsistency.
* Adds missing </summary> closing tag.
Phone Webedit Ops

Original PR author forgot about mindshields for making status icons shaded. 

This can be done with other antag icons as well, I remember people mentioning revs being able to see each other in the dark was lame.
* SapAndSyrup

* centrifug

* morewatervapor

* whyisitnotpushing

* nymphs

* lessrealmorefun
- If the client tries to call ShowAlert while applying gamestates (e.g. initialising an entity) then this will cause problems. I need to double-check the initial PR before I'd be comfortable with this being merged.
* Add new fire sprite for mice that fits them better

* Add the sprite change to rats as well

* Moffroach and hamsters now also have more fitting fire sprites

* made the meta.json easier to read
…26763)

Allow walking over glass shards and D4

Co-authored-by: Plykiya <[email protected]>
Fix watercooler visuals
* add

* invalid
@Rxup Rxup merged commit 7a8f32f into master Apr 7, 2024
9 checks passed
@Rxup Rxup deleted the upstream-sync branch April 9, 2024 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.