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

Lobby art contest #140

Merged
merged 4 commits into from
Oct 9, 2023
Merged

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Oct 9, 2023

About the PR

Removes 1 lobby art at the request of Leonardo DaBepis (Old art, doesn't fit the template)
Removes 1 lobby art at the request of Colin and Leonardo DeBepis (Doesn't fit the template, doesn't fit our theme)
Adds 6 lobby arts related to the lobby art contest.

Media

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

Changelog

🆑

  • add: Added six new lobby art.

@github-actions github-actions bot added the Changes: YML Changes any yml files label Oct 9, 2023
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, it's art!

@Colin-Tel Colin-Tel merged commit e4ed8e0 into DeltaV-Station:master Oct 9, 2023
DeltaV-Bot pushed a commit that referenced this pull request Oct 9, 2023
@FluffiestFloof FluffiestFloof deleted the lobbyartcontest branch October 9, 2023 18:10
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
## Mirror of PR #25972: [Fix shield absorbing asphyxiation
damage](space-wizards/space-station-14#25972)
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)

###### `b0ffed1607452a2d4186228fc2343d10035611e5`

PR opened by <img
src="https://avatars.githubusercontent.com/u/32041239?v=4"
width="16"/><a href="https://github.com/nikthechampiongr">
nikthechampiongr</a> at 2024-03-10 17:36:06 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-11 01:55:19 UTC

---

PR changed 1 files with 12 additions and 2 deletions.

The PR had the following labels:


---

<details open="true"><summary><h1>Original Body</h1></summary>

> fixes #25966
> 
> <!-- 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 shield will now only reduce damage itself can absorb.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> A shield should probably not oxygenate your blood supply.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Instead of just multiplying the damage of the user, we now create a
damagemodiferset with all the damages that the shield can take. For that
we use the shield's damageable component. This does mean that shields
that cannot take damage will no longer absorb damage.
> 
> ## 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: Shields will no longer absorb asphyxiation damage, or any other
damage they themselves can't take.


</details>

Co-authored-by: nikthechampiongr <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants