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

Fix the RMB action on the cigarettes pack and add a new QoL #83170

Merged
merged 4 commits into from May 12, 2024

Conversation

paganiy
Copy link
Contributor

@paganiy paganiy commented May 10, 2024

About The Pull Request

Fix the movement of a pack of cigarettes under an spaceman when they interacts with it with the right mouse button.
Also adds a new way to quickly insert cigarettes in the mouth, just hitting a pack of cigarettes on yourself. Here how it works:

2024-05-10.15-55-11.mp4

Why It's Good For The Game

It fixes the bug and adds a new quick and convenient way to put a cigarette in your mouth. That's good, isn't it?

Changelog

馃啈
qol: Now you can put a cigarette in your mouth just by hitting the pack of cigarettes on yourself.
fix: The cigarette pack no longer moves under the spaceman when they interacts with it with the RMB
/:cl:

@tgstation-server tgstation-server added Fix Rewrites a bug so it appears in different circumstances Quality of Life Increasing esword damage is not a quality of life for traitors labels May 10, 2024
@paganiy
Copy link
Contributor Author

paganiy commented May 10, 2024

oh, wait, there's a pr thar reworks cigarettes #82942 (comment).
what should i do?..

@Rhials
Copy link
Contributor

Rhials commented May 10, 2024

oh, wait, there's a pr thar reworks cigarettes. what should i do?..

By the looks if it, there won't be much conflict between the two PRs. You'll have to update the cigarette path used (line 243) but you should be fine otherwise.

code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
@MrMelbert MrMelbert marked this pull request as draft May 10, 2024 17:37
@paganiy paganiy marked this pull request as ready for review May 10, 2024 20:52
@paganiy paganiy requested a review from MrMelbert May 10, 2024 20:56
@jlsnow301 jlsnow301 merged commit 45b403f into tgstation:master May 12, 2024
20 checks passed
github-actions bot added a commit that referenced this pull request May 12, 2024
comfyorange added a commit that referenced this pull request May 12, 2024
@paganiy paganiy deleted the cigarettes-pack-fix branch May 12, 2024 16:50
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 Quality of Life Increasing esword damage is not a quality of life for traitors
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants