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

Biolock & Tristan Donor Gear #4245

Merged
merged 4 commits into from
Sep 9, 2023
Merged

Conversation

Warfan1815
Copy link
Contributor

@Warfan1815 Warfan1815 commented Aug 24, 2023

About the pull request

A change to Biolock's donor gear (credit to Amory for the sprite)
&
A change to Tristan's donor gear

Changes to legacy donor gear is allowed (to the best of my knowledge)

PR made on behalf of Biolock & Tristan.

Explain why it's good for the game

Donor gear is good

Testing Photographs and Procedure

https://cdn.discordapp.com/attachments/1144067901343666216/1144090409501474916/image.png

Changelog

🆑
add: Changes donor Biolock's medium medic armour to a light custom paintjob armour and donor Tristan's reactive scientist armour to a custom marine armour

@github-actions github-actions bot added the Sprites Remove the soul from the game. label Aug 24, 2023
@Biolock1
Copy link

What an absolute king. I had both Forest and Frozen give this change the okay ^-^

@Warfan1815 Warfan1815 changed the title Biolock Donor Gear Biolock & Tristan Donor Gear Aug 24, 2023
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.

See Files changes tab for annotations of the errors, but its basically, you forgot to edit the dmi here:
image

@Warfan1815
Copy link
Contributor Author

Fixed.

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 look fine.

@Drulikar Drulikar requested a review from a team August 25, 2023 01:32
@Tristan63
Copy link

Warfan is a god, big dubs!

Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

the shading on biolock's armor is fine, but the highlights on tristan's gear need some minor work with the darker color scheme.
made an example of what it should be closer to
image
if you'd rather just use my edit you can copy these images below into whatever software you're using to sprite
image
image

also, for biolock's helmet - "There is a built-in camera on the right side." but that isn't represented on the current sprite what's up with that. would be cool to see and make it more unique than a simple recolor

@morrowwolf morrowwolf marked this pull request as draft September 9, 2023 03:24
@Warfan1815 Warfan1815 marked this pull request as ready for review September 9, 2023 03:37
@Warfan1815
Copy link
Contributor Author

@sleepynecrons fixed

Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

sprites look fine now. approved

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Sep 9, 2023
@sleepynecrons sleepynecrons added this pull request to the merge queue Sep 9, 2023
Merged via the queue into cmss13-devs:master with commit 4a69912 Sep 9, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Sep 9, 2023
github-merge-queue bot pushed a commit that referenced this pull request Sep 14, 2023
# About the pull request

This PR fixes an issue caused by a path remapping in #4245 where a
typecheck for an old fluff value no longer triggered to prevent map
specific camos on the fluff gear.

Note: NO_SNOW_TYPE is more than just snow, but also not all item types
even perform a test on that flag to prevent calling
select_gamemode_skin.

# Explain why it's good for the game

Fixes #4398 (Or any /obj/item/clothing/suit/storage/marine/light/fluff)

# Changelog
:cl: Drathek
fix: Fix some donor items breaking on maps with camos.
fix: Fix donor items not having a fingerprint atom flag and donor armors
not having conductive atom flag.
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants