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

Spooky's Objects Resprites #2780

Merged
merged 7 commits into from
Mar 13, 2024
Merged

Conversation

GenericDM
Copy link
Member

About The Pull Request

A number of assorted resprites for all sorts of objects.

I didn't test this, so I'll let tests run and ensure it compiles fine.

Why It's Good For The Game

image
image
image
image
(Don't worry about the duplicate iconstates I fixed those in the actual DMI)
image

Changelog

🆑 Spooky
tweak: Assorted resprites.
imageadd: A bunch of re-done sprites for various objects. Notably: Sofas, filing cabinets, reagent tanks.
/:cl:

@GenericDM GenericDM requested a review from a team as a code owner February 28, 2024 22:35
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Feb 28, 2024
@thgvr
Copy link
Member

thgvr commented Feb 28, 2024

We're back

@Sun-Soaked
Copy link
Member

crunching metal
taschty

@GenericDM GenericDM marked this pull request as draft February 28, 2024 23:42
Copy link
Member

@Imaginos16 Imaginos16 left a comment

Choose a reason for hiding this comment

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

Spriterbros... We're so fvcking back...

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.

OH SHIT THIS WAS PRED???

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 12, 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 Merge Conflict Use Git Hooks, you're welcome. DME Edit labels Mar 12, 2024
@GenericDM GenericDM marked this pull request as ready for review March 12, 2024 23:21
@rye-rice rye-rice added this pull request to the merge queue Mar 13, 2024
Merged via the queue into shiptest-ss13:master with commit 41e9e43 Mar 13, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Mar 23, 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. -->
A number of assorted resprites for all sorts of objects.

I didn't test this, so I'll let tests run and ensure it compiles fine.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/d3aaf065-2d58-4923-83c2-fdcd9767581c)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/649effea-0ec0-4b4b-823d-5aa8d2b768d3)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/72670766-a3f2-443e-94bf-f7463482e45f)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/f98b64a2-6bcd-4ac6-beb4-a1a3b539446c)
(Don't worry about the duplicate iconstates I fixed those in the actual
DMI)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/41fa6e79-b158-42b2-843f-de0b1799f0ab)
<!-- 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. -->

:cl: Spooky
tweak: Assorted resprites.
imageadd: A bunch of re-done sprites for various objects. Notably:
Sofas, filing cabinets, reagent tanks.
/: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.

5 participants