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

pgf à deux #2571

Merged
merged 9 commits into from
Feb 12, 2024
Merged

pgf à deux #2571

merged 9 commits into from
Feb 12, 2024

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Dec 7, 2023

About The Pull Request

Adds PGF flags and flag supports, sorts out some of decals.dmi
image

Changelog

🆑
add: PGF flag wall mount and item
/:cl:

@thgvr thgvr requested a review from a team as a code owner December 7, 2023 13:38
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Dec 7, 2023
@thgvr thgvr marked this pull request as draft December 7, 2023 13:42
@lectronyx
Copy link

Very specific changelog

@lectronyx
Copy link

Check the directional signs again - should all be sign/directions, but the "you shouldn't see this" one says dign/directions

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jan 17, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jan 30, 2024
@thgvr thgvr marked this pull request as ready for review January 30, 2024 04:25
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 9, 2024
Copy link
Contributor

github-actions bot commented Feb 9, 2024

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 12, 2024
@Imaginos16
Copy link
Member

waga baga bobo

@Imaginos16 Imaginos16 added this pull request to the merge queue Feb 12, 2024
Merged via the queue into shiptest-ss13:master with commit 8eaf842 Feb 12, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 13, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds PGF flags and flag supports, sorts out some of decals.dmi

![image](https://github.com/shiptest-ss13/Shiptest/assets/81882910/73c67325-646f-4905-8c2c-efe342ca1a08)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
## Changelog

:cl:
add: PGF flag wall mount and item
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants