-
Notifications
You must be signed in to change notification settings - Fork 106
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
Weather #172
Closed
SpaceCowboyServer
wants to merge
5
commits into
Vault-Overseers:master-archive-pre-rebase
from
SpaceCowboyServer:weather
Closed
Weather #172
SpaceCowboyServer
wants to merge
5
commits into
Vault-Overseers:master-archive-pre-rebase
from
SpaceCowboyServer:weather
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
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
changed the target of this PR to the archived branch so we can see the actual commits. Do not merge. |
Peptide90
pushed a commit
that referenced
this pull request
Jul 24, 2024
## Mirror of PR #25928: [Fix cream pie bomb when eaten or sliced](space-wizards/space-station-14#25928) 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) ###### `0d0edbba4a1c2af7ecef3318b5f9fe287a63fab5` PR opened by <img src="https://avatars.githubusercontent.com/u/40753025?v=4" width="16"/><a href="https://github.com/Slava0135"> Slava0135</a> at 2024-03-08 13:16:38 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:36:08 UTC --- PR changed 4 files with 22 additions and 4 deletions. The PR had the following labels: --- <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? --> > > ## 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]): > --> > > ![Peek 2024-03-08 15-48](https://github.com/space-wizards/space-station-14/assets/40753025/f7d8aeef-9aca-4b39-a4fe-967b41b26b7f) > > ## 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: Fixed pie bomb not detonating when eaten or sliced (remember to keep hungry mice away from it)! > - tweak: Pie bomb now cannot be ejected or swapped (just hope there is no bomb inside) > </details> --------- Co-authored-by: Vyacheslav Kovalevsky <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
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.
About the PR
Weather is attached to maps and changes randomly over time. Currently the main effect of the weather, besides visuals, is different indoor and outdoor temperature.
Why / Balance
Technical details
Media
Breaking changes
Changelog