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

a #5

Closed
wants to merge 2,217 commits into from
Closed

a #5

wants to merge 2,217 commits into from

Conversation

PolterTzi
Copy link
Owner

About the PR

Why / Balance

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

metalgearsloth and others added 30 commits June 18, 2024 17:47
If the volume hits 0 we just remove it.
* loadout hiding

* department of redundancy department
… png changes (space-wizards#29185)

It was brought up to me in space-wizards#29179 (comment) (and from a dm from them) that space bars can cause issues with the rsi bot.

Upon investigation its case we use "space-delimited" on the "get changes files" check. Which returns ALL changed files. Even if the change has nothing to do with png's or rsi's (example a downstream merging upstream)
* unhardcode thief MaxSelectedSets

* we do a little copy paste :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Revert "Automatic changelog update"

This reverts commit 3358aef.

* Revert "Revert "Automatic changelog update""

This reverts commit 3d0b6a7.

* Removal of the throw cooldown as it felt sluggish and unresponsive before.
* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update
* add

* tweak thickness of stripe
* Update lathes to use entity prototype

* ScrollContainer my hero

* gets rid of excess newlines

---------

Co-authored-by: plykiya <[email protected]>
* fixed cartridges installing more than once

* replaced prototypes with CartridgeComponent

* relocated checks from InstallProgram to InstallCartridge
* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <[email protected]>
* hos cap resprite

* 1. 2. 3 4 Oh
* Fix DeviceLinkSinkComponent not updating sources on shutdown

* Log error

* Misc link changes & fixes

* Fix core
* Add prediction for Tech Disks, cleanup

* Remove IsServer check in OnMapInit

* Use HashSet for techs, remove LINQ
* Code cleanup for radio jammer

* More Entity<T> for the people, and fix an accidental variable reuse
PJB3005 and others added 21 commits June 30, 2024 01:23
Revert "plutonium core steal objective (space-wizards#26786)"

This reverts commit f6ce072.
* fix explosion resistance showing 0 values

* markup
Miners now can produce a fraction of their SpawnAmount corresponding
to the "remaining space" available in their environment according to
their MaxExternalPressure and MaxExternalAmount.
* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
* Fix some job's drobes point light

* Fix some job's drobes point light
-1 is a silly API because now you have to handle it everywhere manually instead of using nullability.
…pace-wizards#29461)

* Fix ItemMapper whitelist mispredict when inserting or removing items

Makes the ItemMapper MapLayerData available on client so that the client
can predict whether an inserted/removed item changes the visibility of
a sprite layer.

* review

---------

Co-authored-by: metalgearsloth <[email protected]>
…s to 35 (space-wizards#29557)

Prices traitor reinforcements to 14, nukie reinforcements to 35

Co-authored-by: plykiya <[email protected]>
Copy link

github-actions bot commented Jul 1, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

github-actions bot commented Jul 1, 2024

Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation

You can move your current work from the master branch to another branch by doing git branch <branch_name and resetting the master branch.

@github-actions github-actions bot closed this Jul 1, 2024
@PolterTzi PolterTzi reopened this Jul 1, 2024
Copy link

github-actions bot commented Jul 1, 2024

RSI Diff Bot; head commit b426d87 merging into e00e774
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after b426d87

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.