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.

Sign up for GitHub

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

Jump to bottom

Legacy Sprites Moar Revive #5200

Merged
merged 28 commits into from
Dec 14, 2023
Merged

Legacy Sprites Moar Revive #5200

merged 28 commits into from
Dec 14, 2023

Conversation

ItsVyzo
Copy link
Contributor

@ItsVyzo ItsVyzo commented Dec 12, 2023 •
edited by github-actions bot
Loading

About the pull request

Revives #2874

Explain why it's good for the game

Soul

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 Triiodine
add: randomized barrels for mappers. You can instance the straps on and off!
imageadd: Resprited the following: traffic cone, goldschlager bottle, cream carton, oj carton, lime juice carton, tomato juice carton, pineapple juice carton, tequila bottle, kahlua bottle, bottle of nothing, cognac bottle, critter crate (now lore accurate), secgear crate, cm barrels, phoron crate, riot shield inhands,
imageadd: Added unique sprites for the following: vodka bottle, gin bottle,
imageadd: Fixed stray pixels on fridgeopen, open_plastic
imagedel: Removed some unused legacy icons.
fix: Hotdogs and burritos now properly appear when worn in a helmet in packaged and unpackaged states.
imageadd: The ME3 hand welder and industrial welder now have unique sprites and inhands.
imageadd: Differentiates synth graft and surgical line, color coded now to represent the damage they fix.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Fix Fix one bug, make ten more labels Dec 12, 2023
@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Dec 12, 2023
@Drulikar Drulikar requested a review from a team December 12, 2023 10:51
@Drulikar Drulikar removed the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Dec 12, 2023
@Drulikar
Copy link
Contributor

Drulikar commented Dec 12, 2023 •
edited
Loading

Many linter errors regarding duplicate icons as well as quantity. See https://github.com/cmss13-devs/cmss13/actions/runs/7180331390/job/19552362649?pr=5200#step:7:337

See https://github.com/cmss13-devs/cmss13/pull/3867/files for an example of how to move icons to a different DMI file and specify in code that they now reside in that different dmi file.

@ItsVyzo
Copy link
Contributor Author

ItsVyzo commented Dec 12, 2023

Many linter errors regarding duplicate icons as well as quantity. See https://github.com/cmss13-devs/cmss13/actions/runs/7180331390/job/19552362649?pr=5200#step:7:337

See https://github.com/cmss13-devs/cmss13/pull/3867/files for an example of how to move icons to a different DMI file and specify in code that they now reside in that different dmi file.

Lookin into it now

@Drulikar
Copy link
Contributor

Also various icons are missing; See https://github.com/cmss13-devs/cmss13/actions/runs/7180331390/job/19552382017?pr=5200#step:7:77

@Drulikar Drulikar marked this pull request as draft December 12, 2023 12:20
@ItsVyzo ItsVyzo marked this pull request as ready for review December 12, 2023 13:38
@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Dec 13, 2023
Drulikar
Drulikar approved these changes Dec 13, 2023
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Code changes are fine

FransFeiffer
FransFeiffer approved these changes Dec 14, 2023
View reviewed changes
Copy link
Contributor

@FransFeiffer FransFeiffer left a comment

Choose a reason for hiding this comment

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

Sprites good I approve

@FransFeiffer FransFeiffer added the Sprites Approved confirmed no stray pixels label Dec 14, 2023
@FransFeiffer FransFeiffer added this pull request to the merge queue Dec 14, 2023
Merged via the queue into cmss13-devs:master with commit 106c92c Dec 14, 2023
28 checks passed
cm13-github added a commit that referenced this pull request Dec 14, 2023
@cm13-github
Automatic changelog for PR #5200 [ci skip]
c25d399
@ItsVyzo ItsVyzo deleted the legacy_sprites_moar_revive branch December 15, 2023 23:04
This was referenced Dec 16, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

@FransFeiffer FransFeiffer FransFeiffer approved these changes

Assignees
No one assigned
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ItsVyzo @Drulikar @FransFeiffer