Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Syndicate Balloon Sprite Update! - #11991

Closed
KillerOrcaCora wants to merge 7 commits into
yogstation13:masterfrom
KillerOrcaCora:Nukie-Balloon-Update
Closed

Syndicate Balloon Sprite Update!#11991
KillerOrcaCora wants to merge 7 commits into
yogstation13:masterfrom
KillerOrcaCora:Nukie-Balloon-Update

Conversation

@KillerOrcaCora

@KillerOrcaCora KillerOrcaCora commented Aug 9, 2021

Copy link
Copy Markdown
Contributor

This PR will change the old syndicate balloon to better fit the new Nukie hud Icon. Has been tested.

Wiki might have to change a PNG.

Changelog

Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR.
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.

/:cl:
imageadd: [Resprite syndicate balloon]

/:cl:
https://streamable.com/2yqnwe

https://streamable.com/x1ftm1

@KillerOrcaCora
KillerOrcaCora requested a review from a team as a code owner August 9, 2021 22:53
@Yogbot-13 Yogbot-13 added the Sprites This PR has spriting changes label Aug 9, 2021
@JamieD1

JamieD1 commented Aug 10, 2021

Copy link
Copy Markdown
Contributor

Changelog is wrong

@nesisknesis nesisknesis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'll take this opportunity to also review the other PR since I didn't get to.

The new HUD looks like a floating head, which as a HUD I don't think looks great. My thinking is that there should be a distinct separation.
I made some drafts on what my take would be
image
Basically a more detailed S with details to make it look like a snake.

However, since itd be awkward to backtrack on a merged PR, you don't have to change it if you don't want to.

As for this PR, there's a random DMI called "Onehandballoon" thats been added and it only contains the old balloon.

You also need to put imageadd: [changes here] in your changelog so that it works.

@KillerOrcaCora

Copy link
Copy Markdown
Contributor Author

Oops ok it should be fixed now.

@nesisknesis

Copy link
Copy Markdown
Contributor

may get conflicts from #11946

@nesisknesis

Copy link
Copy Markdown
Contributor

dwagadsb

@nesisknesis nesisknesis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Okay now that mantis blades are merged, this can also be merged. However, it also created a merge conflict so gods bless your soul and good luck. You'll most likely need to update the items_and_weapons DMI file and reapply your changes, though if that doesn't work tell me.

@JamieD1

JamieD1 commented Aug 30, 2021

Copy link
Copy Markdown
Contributor

Hurry up @KillerOrcaCora

@adamsong adamsong added the Stale I'm closing this in like a week if you don't push a new commit label Sep 7, 2021
@JamieD1

JamieD1 commented Sep 17, 2021

Copy link
Copy Markdown
Contributor

Reopen when you want to proceed

@JamieD1 JamieD1 closed this Sep 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Sprites This PR has spriting changes Stale I'm closing this in like a week if you don't push a new commit

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants