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

[PORT] Adds the ability to jam cigarettes into the filter slot of a gas mask #1324

Merged
merged 2 commits into from
Mar 2, 2024

Conversation

Absolucy
Copy link

@Absolucy Absolucy commented Mar 1, 2024

About The Pull Request

Ports tgstation#76881 (and by extension, tgstation#78544)

Why It's Good For The Game

funny

Changelog

🆑 Absolucy, Momo8289
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:

Momo8289 and others added 2 commits March 1, 2024 08:48
…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.

![image](https://github.com/tgstation/tgstation/assets/42454181/a1d00139-eef3-479a-b8f2-b12b531f6833)
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>
## 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.')
@dwasint dwasint merged commit 1f49d13 into Monkestation:master Mar 2, 2024
20 checks passed
@Absolucy Absolucy deleted the std-clown branch March 2, 2024 19:36
github-actions bot added a commit that referenced this pull request Mar 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants