Upstream Sync #67
Merged
Upstream Sync #67
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
## Mirror of PR #972: [A small change to ifriit.](DeltaV-Station/Delta-v#972) 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-17 14:00:00 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-17 14:09:23 UTC</aside> <sup> `cfe2e712d6fdaef50a3c77635d201d28fe8a16d5` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > Basicly adds playtime requirement to ifriit (so that they cant go shitter mode and to have somesort of knowledge of what they should do) and makes them unable to die from bleedout (cus they are a floating rock) > > <!-- 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 <[email protected]>
## Mirror of PR #975: [Fix #974](DeltaV-Station/Delta-v#975) 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/142105406?v=4" width="16"/><a href="https://github.com/DangerRevolution"> DangerRevolution</a> at 2024-03-17 17:21:59 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/142105406?v=4" width="16"/><a href="https://github.com/DangerRevolution"> DangerRevolution</a> at 2024-03-17 17:31:11 UTC</aside> <sup> `e2d21fe8677a24f632a4729148814272b2a1c6a2` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Status: Needs Review --- <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? --> > the title + it fixes #974 > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > it's not intended > > ## Media > > - [X] this PR does not require an ingame showcase > > > **Changelog** > 🆑 DangerRevolution > - fix: Harpies can now wear prison jumpskirt > > </details> Co-authored-by: Danger Revolution! <[email protected]>
## Mirror of PR #976: [Fix Moth not eating Jumpskirts](DeltaV-Station/Delta-v#976) 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/142105406?v=4" width="16"/><a href="https://github.com/DangerRevolution"> DangerRevolution</a> at 2024-03-17 17:28:00 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/142105406?v=4" width="16"/><a href="https://github.com/DangerRevolution"> DangerRevolution</a> at 2024-03-17 17:45:11 UTC</aside> <sup> `0271f2ac35a433d06f761936e0d644c8a41f4548` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > <!-- What did you change in this PR? --> > > Moths can now eat jumpskirts by adding - clothmade tag > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > moths hungry > > > ## Media > > - [X] 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** > :cl: DangerRevolution > - fix: Moths can now eat skirts > </details> Co-authored-by: Danger Revolution! <[email protected]>
## Mirror of PR #977: [pebble minor patch 3²](DeltaV-Station/Delta-v#977) 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-18 16:00:47 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-18 18:35:38 UTC</aside> <sup> `627e535e3782c3737bb961d3bdfba88abc49ad7c` </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? --> > minor map tweaks on pebble. > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > per request, blatant problems I've seen and player convenience > > **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 > --> > moved east solars up a notch not to be a problem with cargo shuttle > fixed cryosleep casket sending you in a wall (hopefully) > fixed station beacons not to overlap > fixed bombing sites and warps > > 🆑 > > - tweak: pebble minor patch 3 > </details> Co-authored-by: UnicornOnLSD <[email protected]>
## Mirror of PR #979: [Change map prefix to DV](DeltaV-Station/Delta-v#979) 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-19 00:13:41 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-19 02:19:48 UTC</aside> <sup> `1f6cb805d63ec66194dbcc04a8cd4cb20b389711` </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** > Title(I honestly thought this pulled from a random string until yesterday) > > We'll use DV for our maps from here out. </details> Co-authored-by: Velcroboy <[email protected]>
## Mirror of PR #980: [Lunchboxes! Revival](DeltaV-Station/Delta-v#980) 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/49997488?v=4" width="16"/><a href="https://github.com/DebugOk"> DebugOk</a> at 2024-03-19 11:23:47 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/49997488?v=4" width="16"/><a href="https://github.com/DebugOk"> DebugOk</a> at 2024-03-19 11:39:39 UTC</aside> <sup> `9ad761ae18818a8842b3a60c63cfff0b92b18e85` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Changes: Localization - Changes: Sprite --- <details open="true"><summary><h1>Original Body</h1></summary> > The following is copied from #716, but with the sprites all put into a single .RSI file > > ## About the PR > <!-- What did you change in this PR? --> > > Added Lunchboxes > Added pre-filled Lunchboxes, containing a few snacks. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > Variety, lets the chef pack meals for people that they can take with them, rather than leaving food on the kitchen counter! > Also a new storage item, for people to use nested inventory or for people to hide evil items in. > > ## Media > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > >  > > > > **Changelog** > 🆑 DangerRevolution and Noctis > - add: Added lunchboxes to the chefvend and dinnerwarevend for the Chef to fill or hand out pre-made! > </details> Co-authored-by: Debug <[email protected]>
## Mirror of PR #892: [Add Corspman Access & Airlocks](DeltaV-Station/Delta-v#892) 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/52761126?v=4" width="16"/><a href="https://github.com/rosieposieeee"> rosieposieeee</a> at 2024-02-23 18:21:40 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/52761126?v=4" width="16"/><a href="https://github.com/rosieposieeee"> rosieposieeee</a> at 2024-03-19 12:13:13 UTC</aside> <sup> `304fdcd35659c4bdcb17561d093d16b52b172b2e` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Status: Needs Review - Changes: C# - Changes: Localization --- <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? --> > > <img width="524" alt="Content Client_AQ40yzRyFY" src="https://github.com/DeltaV-Station/Delta-v/assets/52761126/eb18fc39-4cba-4d4d-8ea5-25c5aedb1e34"> > > > """Corpsman""" access previously was just medical access on their locker (lol!) and NO access on their suit locker (LOL) > > Tested and works. HoS was given the access too. Warden left out. > > **Changelog** > 🆑 > - add: Added Corpsman-only access and airlocks. > </details> Co-authored-by: rosieposie <[email protected]>
## Mirror of PR #984: [Add Submarine to map pool :)](DeltaV-Station/Delta-v#984) 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-20 22:39:09 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-20 22:49:59 UTC</aside> <sup> `a14b7c5e23f5126ba0e11ea4c321052b2d9d27d1` </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 > Title > > :cl: Rose > - add: Added Submarine Station back to the map pool (for real this time) </details> Co-authored-by: Velcroboy <[email protected]>
## Mirror of PR #989: [Adds Lunchboxes to Lockers](DeltaV-Station/Delta-v#989) 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/142105406?v=4" width="16"/><a href="https://github.com/DangerRevolution"> DangerRevolution</a> at 2024-03-21 17:52:42 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/142105406?v=4" width="16"/><a href="https://github.com/DangerRevolution"> DangerRevolution</a> at 2024-03-21 18:46:44 UTC</aside> <sup> `d07fa88e1dfba6107602c9cf0d58733ed6074274` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > > Title. > > **Changelog** > :cl: DangerRevolution > - add: Added lunchboxes to various staff lockers > </details> Co-authored-by: Danger Revolution! <[email protected]>
## Mirror of PR #991: [Adds pre-set warp points](DeltaV-Station/Delta-v#991) 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-21 18:53:11 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-22 01:35:14 UTC</aside> <sup> `2ad986dddd855df06eb430b0640340b9f14a79ee` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Changes: Localization --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > Title > Will work together with [this](DeltaV-Station/Delta-v#968) to create a cleaner more straightforward WP/Beacon mapping system. > > ## Why / Balance > Easier for mappers. Better for players </details> Co-authored-by: Velcroboy <[email protected]>
## Mirror of PR #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 <[email protected]>
## Mirror of PR #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 <[email protected]>
## Mirror of PR #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 <[email protected]>
## Mirror of PR #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 <[email protected]>
## Mirror of PR #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 <[email protected]>
# 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 <[email protected]>
# Description Reverts [a WizDen change](space-wizards/space-station-14#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 #26044: [Add fancy table spawner](space-wizards/space-station-14#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 <[email protected]>
## Mirror of PR #992: [Fixes missing Weh emote on species](DeltaV-Station/Delta-v#992) 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/9823203?v=4" width="16"/><a href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at 2024-03-21 20:12:16 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/9823203?v=4" width="16"/><a href="https://github.com/FluffiestFloof"> FluffiestFloof</a> at 2024-03-28 18:27:42 UTC</aside> <sup> `c01d0cb4dda77000435ecace940728d4dc3495d6` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML --- <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? --> > Adds weh emote sound on Felinid, Vulpkanin and Harpy. > Also add honk emote sound to Harpy, this is related to the honk reagent or whatever. > Also removes old no longer used Mothroach emotesounds from Nyano days since Mothroach was upstreamed a while ago. > > ## 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 > --> > > 🆑 > - fix: Felinids, Harpies and Vulpkanin should now Weh accordingly. > </details> Co-authored-by: Fluffiest Floofers <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #26033: [Fix arrivals not docking on spinning stations](space-wizards/space-station-14#26033) 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) ###### `9e2e51431938b2df9391939fe499f8963b297292` PR opened by <img src="https://avatars.githubusercontent.com/u/10494922?v=4" width="16"/><a href="https://github.com/ShadowCommander"> ShadowCommander</a> at 2024-03-12 09:44:08 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-12 12:57:35 UTC --- PR changed 1 files with 1 additions and 1 deletions. The PR had the following labels: - Issue: Bug - Size: Very Small --- <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? --> > > Angle tolerance was too tight for the arrivals shuttle to dock on station when it was spinning. > > Changed the tolerance from 0.01 to 0.15. > > Fixes #25901 > > ## 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]): > --> > > - [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! > --> > 🆑 > - fix: Fixed arrivals shuttle not docking with the station when it was slowly spinning. > </details> Co-authored-by: ShadowCommander <[email protected]>
## Mirror of PR #25954: [Buff Zombie Infection](space-wizards/space-station-14#25954) 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) ###### `56ac86a5c19182b2216e73787b47525ffe0b1cba` PR opened by <img src="https://avatars.githubusercontent.com/u/104418166?v=4" width="16"/><a href="https://github.com/liltenhead"> liltenhead</a> at 2024-03-10 01:40:46 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-12 18:44:09 UTC --- PR changed 2 files with 3 additions and 4 deletions. The PR had the following labels: - Status: Needs Review --- <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 > This PR changes the damage numbers of the zombie infection. It also increases the chances of getting infected per bite, with and without clothing. > > ## Why / Balance > Most zombies are created through people getting bit to death, or infecting already dead bodies. Wearing full clothing makes it very unlikely you'll actually get infected before you fall into a critical condition. The zombie infection doing blunt damage means you constantly bleed, making it very obvious you are infected, and makes it very easy to self treat and avoid turning as long as you have Band-Aids. Pure poison damage is much harder to self treat, and overall somewhat slows down the zombie virus from taking hold if you are receiving proper medical care. > > ## 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]): > --> > > - [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 > --> > > > > 🆑 > - tweak: Buffed the zombie virus to do purely poison damage, and more likely to spread the infection per bite. > > > </details> Co-authored-by: liltenhead <[email protected]>
## Mirror of PR #25668: [Add's Senior role drip to the Uniform Printer.](space-wizards/space-station-14#25668) 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) ###### `af57006427d11b4bbc99983a983e5c31a4ee0d8b` PR opened by <img src="https://avatars.githubusercontent.com/u/83733158?v=4" width="16"/><a href="https://github.com/Cojoke-dot"> Cojoke-dot</a> at 2024-02-28 06:09:28 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 08:45:33 UTC --- PR changed 2 files with 64 additions and 0 deletions. The PR had the following labels: - No C# --- <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? --> > Added the Senior position drip to the Uniform Printer > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Senior drip was lost when the roles got removed, this will bring them back without the issue of having the position. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > Added all of the Senior position jumpsuits and skirts to clothing.yml and lathe.yml for the uniform printer. > > ## Media > >  > > > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > None > > **Changelog** > 🆑 > - add: Senior uniforms have been added to the Uniform Printer, visit your local hop today! > > <!-- > 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: Cojoke <[email protected]>
## Mirror of PR #26049: [Fix Sky Blue carpet making red tables](space-wizards/space-station-14#26049) 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) ###### `559d7ac59379c4c01faafaec3213380d8ae0be9f` PR opened by <img src="https://avatars.githubusercontent.com/u/62253058?v=4" width="16"/><a href="https://github.com/Gyrandola"> Gyrandola</a> at 2024-03-12 18:19:09 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 02:03:04 UTC --- PR changed 2 files with 15 additions and 9 deletions. The PR had the following labels: - No C# --- <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? --> > Adding Sky Blue carpets to tables no longer results in red carpet ones. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Fixes #26040 > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > CarpetSBlue tag was missing. > > ## 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 > >  > > > ## 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 > --> > > 🆑 > - fix: Adding Sky Blue carpets to tables no longer results in red carpet ones. > </details> Co-authored-by: Gyrandola <[email protected]>
It's been gone for a bit too long.
…ashing the Game Out of Protest (#339) # Description This fixes a crash related to the CourierDrobe and PrideVend not having thank you messages. Instead of deleting the ability to say a thank you message, I have elected to add thank you messages to both vendors. # Media 
## Mirror of PR #26182: [New wooden furniture](space-wizards/space-station-14#26182) 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) ###### `909b2aaa2d5976122f17f9e4fe6ce1a1389dc619` PR opened by <img src="https://avatars.githubusercontent.com/u/62609550?v=4" width="16"/><a href="https://github.com/Ko4ergaPunk"> Ko4ergaPunk</a> at 2024-03-16 17:30:57 UTC --- PR changed 25 files with 928 additions and 7 deletions. The PR had the following labels: - No C# - Changes: Sprites --- <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 > Adds craftable high and small fences, wooden bench. New stairs. > > ## Media >  > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > **Changelog** > 🆑 Ko4erga > - add: Added craftable high and small wooden fences, bench. New stairs. > </details> Co-authored-by: SimpleStation14 <Unknown>
## Mirror of PR #26353: [Make air tanks appear on the back in suitstorage](space-wizards/space-station-14#26353) 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) ###### `6e8a07844a842c89c32daefbcc70c0336639fe9b` PR opened by <img src="https://avatars.githubusercontent.com/u/45323883?v=4" width="16"/><a href="https://github.com/Dutch-VanDerLinde"> Dutch-VanDerLinde</a> at 2024-03-23 02:16:28 UTC --- PR changed 17 files with 80 additions and 0 deletions. The PR had the following labels: - No C# - Changes: Sprites --- <details open="true"><summary><h1>Original Body</h1></summary> > ## Why / Balance > it looks nice > > also does it to jetpacks > > ## Media >  > >  > >  > > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > </details> Co-authored-by: SimpleStation14 <Unknown>
## Mirror of PR #26382: [Run `fixgridatmos` for cargo & emergency shuttle](space-wizards/space-station-14#26382) 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) ###### `ec761114eacdeed6e68f9c94dddfdbec8a6e26be` PR opened by <img src="https://avatars.githubusercontent.com/u/60421075?v=4" width="16"/><a href="https://github.com/ElectroJr"> ElectroJr</a> at 2024-03-24 07:27:14 UTC --- PR changed 6 files with 60 additions and 575 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > This PR also changes fixgridatmos so that it trimms empty/invalid tiles. > > :cl: > - fix: Fixed the cargo & emergency shuttle not being airtight. > </details> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
# Description Changed the Canisters Sprites to a better updated one, no more ugly 2D Flat Canisters! Also update the TG Sprite from Tank Canisters now shiny! --- <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog :cl: - tweak: Resprited gas canisters - tweak: Resprited gas tanks --------- Co-authored-by: VMSolidus <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Further expanded Assistant gang colors and added them to loadouts VM is bad at helping so image is in comments --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added five new coats - add: Added loadouts - fix: Fixed the coat handhole --------- Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
…ngines into upstream-sync-6
This is apparently a more desirable behavior for global.json, as it allows servers running any version of Dotnet 8.0.1xx to automatically switch to a newer version than the base. This update was apparently required for DS14, NS14, and Syndicate Station to work properly, since Linux servers can't actually run 8.0.100, and the earliest they can use is 8.0.105(which is still a viable version).
…ngines into upstream-sync-6
DEATHB4DEFEAT
added
Priority: 1-Urgent
github-actions
bot
added
Changes: C#
…n-Friendly-Chainsaw into upstream-sync-6
DEATHB4DEFEAT
removed
the
Status: Requires
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.