Adds the ability to jam cigarettes into the filter slot of a gas mask #76881
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Finally mimes can smoke |
|
Maybe also add possibility to put bubblegum in masks? |
Implementing that in the same way doesn't really make a lot of sense. Shoving bubblegum into a gas mask with the intention to chew it wouldn't really work at all. The animation also wouldn't make much sense over a gas mask. |
But you can eat through the mask. |
|
unfathomably based |
|
I can finally be a clown with a stogie in his mouth?? this is the PR of the year imo |
|
i've been waiting on this feature for a while now, thanks |
san7890
requested changes
Jul 17, 2023
|
mark ready for review when this has all been addressed |
Co-authored-by: san7890 <the@san7890.com>
|
I've been told the failed check isn't my fault 👍 |
|
sorry, i didn't accurately explain the balloon alert stuff. they must be complaint with the requirements in this document: https://hackmd.io/@tgstation/SJIle5wYd#balloon_alertballoon_alert_to_viewers this is to mean short, no capitalization nor punctuation, and informative. read the document and follow that for all of the things you've added. |
|
undraft when CI is passing |
MrMelbert
reviewed
Jul 24, 2023
|
I’ve been trying to do my chainsmoking clown gimmick for a while thank fuck |
|
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
bot
added
the
Stale
|
@MrMelbert Changes have been done for a while and it's going stale now. Could I get a merge? |
github-actions
bot
removed
the
Stale
Ghommie
requested changes
Aug 9, 2023
comfyorange
added a commit
that referenced
this pull request
Aug 9, 2023
NaakaKo
referenced
this pull request
in Bird-Lounge/Skyraptor-SS13
Aug 9, 2023
… (#76881) ## About The Pull Request This PR makes it so that when a gas mask of any type (normal, explorer, mime, etc) has isn't holding any filters, and isn't covering the mouth, you can jam a cigarette in there and smoke it like normal. Cigs placed in a mask can be lit by using the lighting implement on the mask as you would a normal cig. The gas mask can't be adjusted while holding a cig (if the gas mask can be adjusted at all). Whether or not internals can be used depends on the mask and its adjusted state.  A mime enjoying their favourite robusto cigars ## Why It's Good For The Game First off, I just find the idea of replacing an air filter in a gas mask, something meant to protect you from harmful gasses and fumes, with a cancer-inducing burning stick of chemicals, to be really funny. Secondly, and the reason that was the initial inspiration for this PR, is it allows mimes and clowns to smoke without removing their masks. This opens the door for mimes and clowns to use smoking as part of their character gimmick, without losing a pretty big part of their identity. ## Changelog :cl: add: Cigarettes can now be placed in and smoked through gas masks, so long as the mask has no filters installed and is not covering the mouth. /:cl: --------- Co-authored-by: san7890 <the@san7890.com>
Jolly-66
pushed a commit
to TaleStation/TaleStation
that referenced
this pull request
Aug 9, 2023
…ter slot of a gas mask (#7219) Original PR: tgstation/tgstation#76881 ----- ## About The Pull Request This PR makes it so that when a gas mask of any type (normal, explorer, mime, etc) has isn't holding any filters, and isn't covering the mouth, you can jam a cigarette in there and smoke it like normal. Cigs placed in a mask can be lit by using the lighting implement on the mask as you would a normal cig. The gas mask can't be adjusted while holding a cig (if the gas mask can be adjusted at all). Whether or not internals can be used depends on the mask and its adjusted state.  A mime enjoying their favourite robusto cigars ## Why It's Good For The Game First off, I just find the idea of replacing an air filter in a gas mask, something meant to protect you from harmful gasses and fumes, with a cancer-inducing burning stick of chemicals, to be really funny. Secondly, and the reason that was the initial inspiration for this PR, is it allows mimes and clowns to smoke without removing their masks. This opens the door for mimes and clowns to use smoking as part of their character gimmick, without losing a pretty big part of their identity. ## Changelog :cl: add: Cigarettes can now be placed in and smoked through gas masks, so long as the mask has no filters installed and is not covering the mouth. /:cl: --------- Co-authored-by: Nick <42454181+Momo8289@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com>
MrMelbert
pushed a commit
that referenced
this pull request
Sep 25, 2023
## About The Pull Request #76881 allowed you to put cigarettes in a gas mask but removed the check for, if the thing was a cigarette, making sure it was in your mask slot. What this meant was that standing around with a cigarette in your hand would still make you passively smoke it - although this is somewhat more immersive to me as a former smoker, it also gets obnoxious having to set the cigarette on a table or put it in my bag to avoid racking up the ridiculously easy-to-accumulate nicotine addiction points you otherwise get from even one cigarette in-game. This just readds that check after the checks for gas masks/non-smoker locations (which may also be broken but are beyond me right now - trying to put a cigarette into a gas mask's filter* slot returns 'mask's mouth is covered.')
Absolucy
pushed a commit
to Absolucy/Monkestation
that referenced
this pull request
Mar 1, 2024
…tgstation#76881) This PR makes it so that when a gas mask of any type (normal, explorer, mime, etc) has isn't holding any filters, and isn't covering the mouth, you can jam a cigarette in there and smoke it like normal. Cigs placed in a mask can be lit by using the lighting implement on the mask as you would a normal cig. The gas mask can't be adjusted while holding a cig (if the gas mask can be adjusted at all). Whether or not internals can be used depends on the mask and its adjusted state.  A mime enjoying their favourite robusto cigars First off, I just find the idea of replacing an air filter in a gas mask, something meant to protect you from harmful gasses and fumes, with a cancer-inducing burning stick of chemicals, to be really funny. Secondly, and the reason that was the initial inspiration for this PR, is it allows mimes and clowns to smoke without removing their masks. This opens the door for mimes and clowns to use smoking as part of their character gimmick, without losing a pretty big part of their identity. :cl: add: Cigarettes can now be placed in and smoked through gas masks, so long as the mask has no filters installed and is not covering the mouth. /:cl: --------- Co-authored-by: san7890 <the@san7890.com>
Absolucy
pushed a commit
to Absolucy/Monkestation
that referenced
this pull request
Mar 1, 2024
## About The Pull Request tgstation#76881 allowed you to put cigarettes in a gas mask but removed the check for, if the thing was a cigarette, making sure it was in your mask slot. What this meant was that standing around with a cigarette in your hand would still make you passively smoke it - although this is somewhat more immersive to me as a former smoker, it also gets obnoxious having to set the cigarette on a table or put it in my bag to avoid racking up the ridiculously easy-to-accumulate nicotine addiction points you otherwise get from even one cigarette in-game. This just readds that check after the checks for gas masks/non-smoker locations (which may also be broken but are beyond me right now - trying to put a cigarette into a gas mask's filter* slot returns 'mask's mouth is covered.')
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This PR makes it so that when a gas mask of any type (normal, explorer, mime, etc) has isn't holding any filters, and isn't covering the mouth, you can jam a cigarette in there and smoke it like normal. Cigs placed in a mask can be lit by using the lighting implement on the mask as you would a normal cig. The gas mask can't be adjusted while holding a cig (if the gas mask can be adjusted at all). Whether or not internals can be used depends on the mask and its adjusted state.
A mime enjoying their favourite robusto cigars
Why It's Good For The Game
First off, I just find the idea of replacing an air filter in a gas mask, something meant to protect you from harmful gasses and fumes, with a cancer-inducing burning stick of chemicals, to be really funny.
Secondly, and the reason that was the initial inspiration for this PR, is it allows mimes and clowns to smoke without removing their masks. This opens the door for mimes and clowns to use smoking as part of their character gimmick, without losing a pretty big part of their identity.
Changelog
🆑
add: Cigarettes can now be placed in and smoked through gas masks, so long as the mask has no filters installed and is not covering the mouth.
/:cl: