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

More Vox Sprites - The Frontiersmen #3282

Merged
merged 4 commits into from
Aug 17, 2024

Conversation

firebudgy
Copy link
Contributor

@firebudgy firebudgy commented Aug 6, 2024

About The Pull Request

Adds general sprites to the Frontiersmen for the Vox.

Your average grunts...
image
Frontiersman uniform, sans armor
image
Deckhands!
image
Vessel Command
image
Fleet Command
image

Why It's Good For The Game

The faction rooted in Vox history finally has sprites to represent the Vox themselves. That's pretty cool I think.

Changelog

🆑 Cloudbreak
add: Frontiersman sprites for the Vox!
/:cl:

@firebudgy firebudgy requested a review from a team as a code owner August 6, 2024 07:39
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Aug 6, 2024
@@ -10,12 +10,14 @@
can_adjust = FALSE
icon = 'icons/obj/clothing/faction/frontiersmen/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/uniforms.dmi'
supports_variations = VOX_VARIATION
Copy link
Member

Choose a reason for hiding this comment

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

You only need this set on the base type

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes made

@goober3
Copy link
Member

goober3 commented Aug 6, 2024

dripped out

@thgvr thgvr enabled auto-merge August 10, 2024 00:09
@thgvr thgvr added this pull request to the merge queue Aug 10, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Aug 10, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 10, 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 Aug 11, 2024
@rye-rice rye-rice added this pull request to the merge queue Aug 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 17, 2024
@rye-rice rye-rice added this pull request to the merge queue Aug 17, 2024
Merged via the queue into shiptest-ss13:master with commit 026a36d Aug 17, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Aug 19, 2024
## About The Pull Request

Adds general sprites to the Frontiersmen for the Vox.

Your average grunts...

![image](https://github.com/user-attachments/assets/356fd77a-985b-440a-959c-0e5554b93179)
Frontiersman uniform, sans armor

![image](https://github.com/user-attachments/assets/f4a54036-4dda-4367-9789-d038283ea30d)
Deckhands!

![image](https://github.com/user-attachments/assets/ca8a396f-3b7f-41eb-80f7-9142774f650a)
Vessel Command

![image](https://github.com/user-attachments/assets/6e912531-c3fe-4aae-85a0-f18d8b8cc48e)
Fleet Command

![image](https://github.com/user-attachments/assets/8f2c8bb4-09b7-422d-b8ac-0c3a586f74bc)


## Why It's Good For The Game

The faction rooted in Vox history finally has sprites to represent the
Vox themselves. That's pretty cool I think.

## Changelog

:cl: Cloudbreak
add: Frontiersman sprites for the Vox!
/:cl:
Constellado pushed a commit to Constellado/PentestOld that referenced this pull request Aug 27, 2024
## About The Pull Request

Adds general sprites to the Frontiersmen for the Vox.

Your average grunts...

![image](https://github.com/user-attachments/assets/356fd77a-985b-440a-959c-0e5554b93179)
Frontiersman uniform, sans armor

![image](https://github.com/user-attachments/assets/f4a54036-4dda-4367-9789-d038283ea30d)
Deckhands!

![image](https://github.com/user-attachments/assets/ca8a396f-3b7f-41eb-80f7-9142774f650a)
Vessel Command

![image](https://github.com/user-attachments/assets/6e912531-c3fe-4aae-85a0-f18d8b8cc48e)
Fleet Command

![image](https://github.com/user-attachments/assets/8f2c8bb4-09b7-422d-b8ac-0c3a586f74bc)


## Why It's Good For The Game

The faction rooted in Vox history finally has sprites to represent the
Vox themselves. That's pretty cool I think.

## Changelog

:cl: Cloudbreak
add: Frontiersman sprites for the Vox!
/:cl:
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.

4 participants