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

Intel Chestrig #5272

Merged
merged 2 commits into from
Jan 2, 2024
Merged

Intel Chestrig #5272

merged 2 commits into from
Jan 2, 2024

Conversation

ihatethisengine
Copy link
Contributor

@ihatethisengine ihatethisengine commented Dec 21, 2023

About the pull request

Adds intel chestrig, pretty same as intel backpack but with a different sprite.

Explain why it's good for the game

Sprites.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.
image (8)
image (7)
image (6)
image (5)
image (4)
image (3)
image (2)
image (1)
image

Changelog

🆑 poltava, ihatethisengine
add: added intel chestrig
imageadd: added sprites for intel chestrig
/:cl:

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 21, 2023
@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Dec 21, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 21, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

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

Code, not that there's much anyway.

@Drulikar Drulikar requested a review from a team December 30, 2023 06:25
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

sprites gud

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jan 2, 2024
@nauticall nauticall added this pull request to the merge queue Jan 2, 2024
Merged via the queue into cmss13-devs:master with commit 78bf17e Jan 2, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Jan 2, 2024
This was referenced Feb 2, 2024
github-merge-queue bot pushed a commit that referenced this pull request Feb 4, 2024
# About the pull request

Updates the sprite of expedition the chestrig IOs can use from original
#5272

# Explain why it's good for the game

Sprite


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

![image](https://github.com/cmss13-devs/cmss13/assets/157595993/95112882-825c-4610-98ee-951bfbc8cdd3)


![image](https://github.com/cmss13-devs/cmss13/assets/157595993/07e0a84b-5fde-4242-9de8-1005a1217306)

</details>


# Changelog
:cl:Poltava
imageadd: updated intel expedition chestrig sprite
/:cl:

---------

Co-authored-by: PoltavskaPraca <42skrell42gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants