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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes cigarettes smoking on any slot #78544

Merged
merged 1 commit into from
Sep 25, 2023

Conversation

Higgin
Copy link
Contributor

@Higgin Higgin commented Sep 24, 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.')

Why It's Good For The Game

fix good, let me do my nicotine slave rp

Changelog

馃啈
fix: cigarettes no longer smoke themselves from inside your pockets or on your hands.
/:cl:

@tgstation-server tgstation-server added the Fix Rewrites a bug so it appears in different circumstances label Sep 24, 2023
@github-actions
Copy link
Contributor

You currently have a negative Fix/Feature pull request delta of -11. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

@Momo8289
Copy link
Contributor

oops thanks lol

@MrMelbert MrMelbert merged commit 125f361 into tgstation:master Sep 25, 2023
24 checks passed
github-actions bot added a commit that referenced this pull request Sep 25, 2023
comfyorange added a commit that referenced this pull request Sep 25, 2023
Jolly-66 pushed a commit to TaleStation/TaleStation that referenced this pull request Sep 27, 2023
Original PR: tgstation/tgstation#78544
-----
## 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.')

## Why It's Good For The Game

fix good, let me do my nicotine slave rp 

## Changelog

:cl:
fix: cigarettes no longer smoke themselves from inside your pockets or
on your hands.
/:cl:

---------

Co-authored-by: Higgin <cdonny11@yahoo.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
Labels
Fix Rewrites a bug so it appears in different circumstances
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants