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

Removes edgy joke #2635

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Conversation

tiramisuapimancer
Copy link
Contributor

About The Pull Request

Removes the edgy human trafficking joke poster. It was originally my addition and I will politely request that I would prefer to not have it exist in the codebase anymore if it is somehow deemed that this removal is otherwise inappropriate.

Why It's Good For The Game

It was never that funny actually.

Changelog

🆑
del: Removed the edgy human trafficking/SGT joke poster
/:cl:

@tiramisuapimancer tiramisuapimancer requested a review from a team as a code owner January 9, 2024 22:03
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jan 9, 2024
@thgvr
Copy link
Member

thgvr commented Jan 9, 2024

soulless....

Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

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

some maps apparently use this poster, can you change the instances used in maps to something else so it doesn't error?

@tiramisuapimancer
Copy link
Contributor Author

on it

@tiramisuapimancer tiramisuapimancer requested a review from a team as a code owner January 11, 2024 01:44
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Jan 11, 2024
@tiramisuapimancer
Copy link
Contributor Author

did this in VSC and not through SDMM but hopefully doesnt break anythng

@FalloutFalcon
Copy link
Member

Could you put up an image of it just for clarity of what your removing? I don't think i have ever seen it in game? icon_diff is unreadable

@rye-rice
Copy link
Member

image

this is the poster in question

@rye-rice rye-rice added this pull request to the merge queue Jan 11, 2024
Merged via the queue into shiptest-ss13:master with commit 8cf6030 Jan 11, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jan 12, 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
Removes the edgy human trafficking joke poster. It was originally my
addition and I will politely request that I would prefer to not have it
exist in the codebase anymore if it is somehow deemed that this removal
is otherwise inappropriate.

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

## Why It's Good For The Game
It was never that funny actually.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed the edgy human trafficking/SGT joke poster
/: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. -->
@tiramisuapimancer tiramisuapimancer deleted the edge-removal branch April 7, 2024 05:00
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. Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants