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

Spooktober Costumes: Headwear Pack #15927

Merged
merged 24 commits into from
Sep 29, 2023
Merged

Conversation

wolfolotl
Copy link
Contributor

[Clothing]

About the PR

adds the axe headband, giraffe hat, stag beetle helm, rhino beetle helm, tengu mask, minotaur mask, four colors of elephant hat, and four colors (or, well, three colors and a variant) of mushroom hat

image

these items are available to purchase under the Costumes category of the clothing booth during Spooktober, but may be found through other avenues (mainly cargo crates and debris loot crates) during other times of year

image

Why's this needed?

having silly things to wear on your head is fun, and it just felt right to debut these with Spooktober right around the corner!

image

Changelog

(u)Waffleloffle
(*)Adds some particularly costumey headwear, available for purchase at the Clothing Booth during the month of Spooktober.

@keywordlabeler keywordlabeler bot added the A-Clothing Deals with clothing of whatever sort label Sep 21, 2023
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Sep 21, 2023
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 21, 2023
Copy link
Contributor

@MyNameIsRomayne MyNameIsRomayne left a comment

Choose a reason for hiding this comment

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

For the descriptions of the mushroom hats, you can do desc += (more text) to not have to rewrite the original description all the time. I think.

Copy link
Contributor

@MyNameIsRomayne MyNameIsRomayne left a comment

Choose a reason for hiding this comment

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

Nah im wrong whoops this all LGTM then

@github-actions github-actions bot added the S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) label Sep 25, 2023
@MyNameIsRomayne
Copy link
Contributor

HM ok wait i kinda gotta sleep but get_random_subtype(/obj/item/clothing/head/mushroomcap/) should help out here, and removing the random subtype and replacing it with getting a random subtype at each point??? maybe???

@wolfolotl
Copy link
Contributor Author

HM ok wait i kinda gotta sleep but get_random_subtype(/obj/item/clothing/head/mushroomcap/) should help out here, and removing the random subtype and replacing it with getting a random subtype at each point??? maybe???

ooh I'll look into this, mostly just did it this way for consistency with the other hats (and because it fits well in lists of items)

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 25, 2023
@wolfolotl
Copy link
Contributor Author

dmi merge conflicts my beloathed

Copy link
Contributor

@MyNameIsRomayne MyNameIsRomayne left a comment

Choose a reason for hiding this comment

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

looks 99.99% good im sure a dev might comment on my placement of ..() at the end rather than the start but im pretty sure thats fine too

code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 28, 2023
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
code/obj/item/clothing/hats.dm Outdated Show resolved Hide resolved
wolfolotl and others added 6 commits September 28, 2023 18:59
Co-authored-by: Sovexe <33204415+Sovexe@users.noreply.github.com>
Co-authored-by: Sovexe <33204415+Sovexe@users.noreply.github.com>
Co-authored-by: Sovexe <33204415+Sovexe@users.noreply.github.com>
Co-authored-by: Sovexe <33204415+Sovexe@users.noreply.github.com>
Co-authored-by: Sovexe <33204415+Sovexe@users.noreply.github.com>
@Sovexe Sovexe merged commit 62e92d5 into goonstation:master Sep 29, 2023
23 checks passed
github-actions bot pushed a commit that referenced this pull request Sep 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Clothing Deals with clothing of whatever sort C-Sprites Automatically applied on any .dmi or icons folder change S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants