This repository has been archived by the owner on Apr 27, 2024. It is now read-only.
Reset to Einstein Engines #13
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Make the round end sound collection a cvar * Fix comment * Clarity (cherry picked from commit 30ccde0)
(cherry picked from commit a0d159b)
Cryo Access Fix (cherry picked from commit 5d94192)
(cherry picked from commit a4804db)
Expensive coat (cherry picked from commit 8dedbf2)
Stamp Detective (cherry picked from commit 81b0164)
(cherry picked from commit 7a7e0e8)
(cherry picked from commit c38b44e)
…pace-wizards#25762) (cherry picked from commit 2904ff4)
initial commit (cherry picked from commit 55b0cb1)
(cherry picked from commit 0fde3b0)
* move space heaters into cargo * AAA!!! the indentation1!!! * remove crate (cherry picked from commit 9cdffb7)
(cherry picked from commit 1c628b2)
…ace-wizards#25764) (cherry picked from commit a5200cc)
…pace-wizards#25743) * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. Fixes a paradox where selecting a research server requires a research server to already be selected. This would softlock the research client until it is reconstructed. * style: Discards the discard operator Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit aaf5d0d)
…e-wizards#24899) Weight based delay, retuned average, fixed comments (cherry picked from commit c775410)
(cherry picked from commit e7a806a)
* Alert autoremove v0 * Code cleanup and timing * comment * Tritium, code compression * not resolving manually * reduced lookups, new comp * fix-fix yes * use RemCompDeferred, handle OnUnpaused * missed a todo * entitysystem resolve * remove unnecessary component updates * remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan * Code cleanup * comments * combines AutoRemove input into Clear * minor logic adjustment that does not really change anything but is less ambiguous (cherry picked from commit ecd2d5a)
(cherry picked from commit 6476b62)
1 (cherry picked from commit 3253499)
This is a trash item for the most part, and should get picked up by the janitor's trash bag (cherry picked from commit 2e60d33)
(cherry picked from commit 709881f)
* add SubGamemodes comp/sys * remove RuleChance from thief rule * use SubGamemodes for adding thief rule instead of adding ThiefRule component to random gamemodes * clean up thief rule prototype * add better logging + end rule if it fails to start * march 1st incident * preset ops * the dreaded --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 7f060eb)
* fix(seizures): remove seizures from the game * Reduced animation time to 2 seconds (cherry picked from commit bc2dee9)
* loc * per review * Update Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit 4f7facb)
…tart (also lobby music not looped anymore) (space-wizards#25530) * fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) * refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished. * refactor: incapsulated info on current lobby track in simple record * refactor: fixed inconsistent naming between song and soundtrack for lobbymusic * refactor: xml-doc for LobbyPlaylistChangedEvent * fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> (cherry picked from commit 4c87dcd)
(cherry picked from commit 10cf948)
* feat(inventory): Add secondary quick-remove star * style: Fix end of file newline * feat(inventory): Change secondary smart-equip star to silver star * feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary (cherry picked from commit c8cc806)
(cherry picked from commit b412ad4)
## Mirror of PR space-wizards#996: [Revert "Revert "Revert AME buff""](DeltaV-Station/Delta-v#996) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/107660393?v=4" width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a> at 2024-03-23 00:07:05 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/107660393?v=4" width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a> at 2024-03-23 00:16:26 UTC</aside> <sup> `b4fc2e342be6ef395b1ca21f27787ac08a89df59` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: C# --- <details open="true"><summary><h1>Original Body</h1></summary> > Reverts DeltaV-Station/Delta-v#939 > > We might revert this again if everything burns but it's worth a shot. Let's gooo > > > **Changelog** > 🆑 Velcroboy > - tweak: Reverted AME buff. AME will require more than 1 core again to function properly. </details> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
## Mirror of PR space-wizards#997: [Map Edits](DeltaV-Station/Delta-v#997) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/107660393?v=4" width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a> at 2024-03-23 00:23:02 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/107660393?v=4" width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a> at 2024-03-23 00:47:53 UTC</aside> <sup> `82d700ffe85308dc51117f9b5084058b62609991` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: Map --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > Arena > - Sorts warp point and map beacons > - For real this time zips the zapper in the arena > - Adds anti-anomaly zones > > NTES-Seal > - Replaces frosted windows with tinted as The Lorb intended > - Attempts to fix the wallmounted nanomeds </details> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
## Mirror of PR space-wizards#1003: [fixed tortuga cryo](DeltaV-Station/Delta-v#1003) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/149102472?v=4" width="16"/><a href="https://github.com/UnicornOnLSD"> UnicornOnLSD</a> at 2024-03-25 16:02:51 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/149102472?v=4" width="16"/><a href="https://github.com/UnicornOnLSD"> UnicornOnLSD</a> at 2024-03-25 16:21:20 UTC</aside> <sup> `97487b69c77f3b065d12a15d9792446df3d72139` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Status: Needs Review - Changes: Map --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > changed the cryo pump > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > it emptied all the can into the loop, making it overpressurised and killing patients, which a normal gas pump won't do > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase >  > that lil' guy > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > made the volumetric pump on tortuga's cryo circuit into a gas pump, it won't dump all of the can and instead fill properly the loop with the correct pressure, not making it over pressurised > 🆑 > - fix: tortuga's cryogenics adjusted not to be of harm to patients > </details> Co-authored-by: UnicornOnLSD <149102472+UnicornOnLSD@users.noreply.github.com>
## Mirror of PR space-wizards#990: [A quick fix to shoukou](DeltaV-Station/Delta-v#990) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/144424013?v=4" width="16"/><a href="https://github.com/Adrian16199"> Adrian16199</a> at 2024-03-21 18:42:07 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/144424013?v=4" width="16"/><a href="https://github.com/Adrian16199"> Adrian16199</a> at 2024-03-25 18:02:26 UTC</aside> <sup> `cccd4cfb04433e6e06e8a75d2a19bebe3cda6b62` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Status: Needs Review - Changes: Map --- <details open="true"><summary><h1>Original Body</h1></summary> > Basicly just does small fixes that were told to me. Warden's wall monitor is now located on the table because previously it was on a wall that wasnt even accesable Salvage was readjusted due to no shuttle and given conveyors to help moving the cargo inside Prisoner wall lockers now contain jumpsuit and jumpskirt for any new prisoners > > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > </details> Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
…e-wizards#76) ## Mirror of PR space-wizards#994: [Whitelistremoves now requires either ban or whitelist, not both](DeltaV-Station/Delta-v#994) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/56081759?v=4" width="16"/><a href="https://github.com/NullWanderer"> NullWanderer</a> at 2024-03-21 23:16:47 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/56081759?v=4" width="16"/><a href="https://github.com/NullWanderer"> NullWanderer</a> at 2024-03-27 23:53:10 UTC</aside> <sup> `a2a3bcbb869530aa1511af8339d8abc2cc84eba8` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: C# --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > Admins asked for it, and it looks to be a mistake in the code > > **Changelog** > :cl: > DELTAVADMIN: > - fix: whitelistremove now requires either ban or whitelist, not both. > > </details> Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
# Description There was a miscommunication, and I bungled the repository during the last round of merges. The Mirror Bot is not quite finished yet, and some polishing needs to happen behind the scenes before we can actually start doing this. Also new policies from the discord are pending regarding how these PRs need to be handled. I'll need to either reopen or remake the reverted PRs, since we do actually still need them. But we need PRs mirrored from Wizards' Den in order to go through the list properly. 
Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
…s#106) # Description Reverts [a WizDen change](space-wizards#24965) to the sectech specifically calling out the Syndicate even though the Syndicate terrorist attacks are supposed to be unexpected and uncommon even if that is not reflected in gameplay. # Changelog :cl: - tweak: Sectech now says "Crack communist skulls!" instead of "Crack syndicate skulls!"
## Mirror of PR space-wizards#26044: [Add fancy table spawner](space-wizards#26044) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `f5f5eebeeeee005a955ebd2814b4b9d6204e72ef` PR opened by <img src="https://avatars.githubusercontent.com/u/107660393?v=4" width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a> at 2024-03-12 16:09:24 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-13 06:21:51 UTC --- PR changed 1 files with 22 additions and 0 deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > Adds fancy table spawner for mapping random fancy tables > > ## Why / Balance > Nice > > ## Technical details > n/a > > ## Media > n/a > - [x] I have added screenshots/videos to this PR showcasing its changes in-game, **or** this PR does not require an in-game showcase > > ## Breaking changes > n/a > > **Changelog** > n/a > </details> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
(cherry picked from commit 08741d2)
(cherry picked from commit ebc1870)
(cherry picked from commit 59b6e76)
(cherry picked from commit 0f66634)
(cherry picked from commit 897f82c)
(cherry picked from commit f0a44a6)
IPCs / Machine People (cherry picked from commit 652148b)
(cherry picked from commit 6867848)
(cherry picked from commit d0988af)
(cherry picked from commit a6b7f41)
(cherry picked from commit b617142)
(cherry picked from commit 5e1e520)
(cherry picked from commit 1ad78cf)
(cherry picked from commit 48a728c)
This reverts commit 0a5ec452d5f445008163f1c3c84b4f6c4123fb2f.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Deep Station 14 Pull Request
About the PR
Why / Balance
Technical details
Media