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

Cigarettes and vapes are no longer subtypes of masks. #82942

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Cigarettes and vapes are no longer subtypes of masks. #82942

wants to merge 6 commits into from
+267 −258

Conversation

Ghommie
Copy link
Member

@Ghommie Ghommie commented Apr 28, 2024 •
edited

About The Pull Request

Since non-clothing items can also be worn on several slots, there's no need for cigarettes/vapes to be subtypes of masks anymore, since that comes with a few oddities like #82870.

Why It's Good For The Game

This should fix #82870, with about no side-effect aside them no longer being edible by moths 🤢.

Changelog

🆑
fix: cigarettes and vapes are no longer treated as clothing (eg. They no longer get shredded and need to be repaired with... cloth).
/:cl:

@tgstation-server tgstation-server added Sprites A bikeshed full of soulless bikes. Fix Rewrites a bug so it appears in different circumstances Map Edit Thank you for your tile-placing service. It's always appreciated. labels Apr 28, 2024
MrMelbert
MrMelbert reviewed Apr 28, 2024
View reviewed changes
Copy link
Contributor

@MrMelbert MrMelbert left a comment

Choose a reason for hiding this comment

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

Needs an updatepath script

@tgstation-server tgstation-server added the Tools We pretend to be a real development community label Apr 28, 2024
@github-actions github-actions bot requested a review from MrMelbert April 28, 2024 21:14
@Wallemations
Copy link
Contributor

RIP wearing a cigarette for chameleon mask

@Ghommie
Copy link
Member Author

Ghommie commented Apr 29, 2024

RIP wearing a cigarette for chameleon mask

Dangit, I was too optimistic that I forgot about this nitbit. I'll peep into chameleon (shit)code later to make sure this won't be the case.

@MrMelbert
Copy link
Contributor

Dangit, I was too optimistic that I forgot about this nitbit. I'll peep into chameleon (shit)code later to make sure this won't be the case.

Actually fairly easy, all you need to do is call add_chameleon_items(/obj/item/cigarette) in /datum/action/item_action/chameleon/change/mask/initialize_disguises()

@EricZilla
Copy link
Contributor

Nooooooo I can't believe this, I love eating cigarettes and joints OTL
(This is probably a good change)

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 7, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale Even the uncaring universe rejects you, why even go on label May 7, 2024
@san7890 san7890 added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label May 9, 2024
@paganiy paganiy mentioned this pull request May 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Imaginos16 Imaginos16 Awaiting requested review from Imaginos16 Imaginos16 is a code owner

@Krysonism Krysonism Awaiting requested review from Krysonism Krysonism is a code owner

@Twaticus Twaticus Awaiting requested review from Twaticus Twaticus is a code owner

@Wallemations Wallemations Awaiting requested review from Wallemations Wallemations is a code owner

@EOBGames EOBGames Awaiting requested review from EOBGames EOBGames is a code owner

@Maurukas Maurukas Awaiting requested review from Maurukas Maurukas is a code owner

@MMMiracles MMMiracles Awaiting requested review from MMMiracles MMMiracles is a code owner

@san7890 san7890 Awaiting requested review from san7890 san7890 is a code owner

@ShizCalev ShizCalev Awaiting requested review from ShizCalev ShizCalev is a code owner

@Watermelon914 Watermelon914 Awaiting requested review from Watermelon914 Watermelon914 is a code owner

@Mothblocks Mothblocks Awaiting requested review from Mothblocks Mothblocks is a code owner

@JohnFulpWillard JohnFulpWillard Awaiting requested review from JohnFulpWillard JohnFulpWillard is a code owner

@Fikou Fikou Awaiting requested review from Fikou Fikou is a code owner

@MrMelbert MrMelbert Awaiting requested review from MrMelbert MrMelbert is a code owner

Assignees
No one assigned
Labels
Fix Rewrites a bug so it appears in different circumstances Map Edit Thank you for your tile-placing service. It's always appreciated. Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts Sprites A bikeshed full of soulless bikes. Stale Even the uncaring universe rejects you, why even go on Tools We pretend to be a real development community
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cigarettes can be damaged, making them unwearable
6 participants
@Ghommie @Wallemations @MrMelbert @EricZilla @tgstation-server @san7890