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

Cresssprites pt. 1 (clothes and stamp) #287

Closed
wants to merge 25 commits into from

Conversation

Higgin
Copy link

@Higgin Higgin commented Jun 21, 2023

Adds new items, sprites, and spawners for thedragmeme's cresstation and character.

image
image
image
image

This includes a purple resprite of three parts of the noble_equipment set (with a new spawner for the specific pieces that were redone) as well as the full 'winter princess' set of gear intended for the noble ambassador role on the eventual map PR. (The 'ambassador' stamp is also included in this PR.)

This PR includes a change to make our toggles.dm behave like /tg/'s. One unintended side effect of this (see the last picture) is that until the upstream PR splitting up coats, hoods, and allowing winter coats to be zipped is merged, tgstation/tgstation#74886, winter coats will show their hooded/fully-zipped icon-state on the outerwear slot when the hood is up. It's minor, but it should resolve with an upstream merge as it's a direct copy of the /tg/ file with exception to two procs we also don't use yet (for updating clothing buttons.) I adopted this behavior because it was also the cleanest way to get the sprites as formatted to work and to allow the cloak to be worn as either an exosuit or neck-slot item.

Please let me know what if anything I might need to do to this, or if that's alright - God knows I could squash the commits, but I don't want to lose the history in case I need to change something around the toggles.

@Draggeru
Copy link
Contributor

I always enjoy it when people indulge in my laziness

@github-actions github-actions bot added the Merge Conflict Resolve it or perish label Jun 27, 2023
@Draggeru Draggeru mentioned this pull request Jul 24, 2023
@Draggeru
Copy link
Contributor

Assuming Crit added the stamp #422 should be able to close this

@Higgin Higgin closed this Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge Conflict Resolve it or perish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants