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

Functional M5 Gasmask 2: Electric Boogaloo #5083

Merged
merged 6 commits into from
Dec 6, 2023

Conversation

Ediblebomb
Copy link
Contributor

@Ediblebomb Ediblebomb commented Nov 30, 2023

About the pull request

Makes the M5 Gasmask actually work
70% NVG code 30% trial and error

This time I probably won't fuck things up.

#5072

Explain why it's good for the game

Consistency, the regular gasmask protects you against CN20 Nerve Gas, whereas the helmet gasmask previously did not.

Testing Photographs and Procedure

Screenshots & Videos
Gas.mp4

Changelog

🆑 Ediblebomb
add: M5 Helmet Gasmask now functions as a gasmask when in a marine helmet (and yes, gasmasks do still have some functionality)
/:cl:

70% NVG code 30% trial and error
@github-actions github-actions bot added the Feature Feature coder badge label Nov 30, 2023
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

Uh... You can't just edit flags like this, helmets have subtypes with different flags that would get removed when you remove the gas mask. This is ideally a job for traits but that needs refactoring said flags

At the very least you need to use initial() here - and i'm not sure it's enough depending on item interactions

I don't want to make Functional M5 Gasmask 3: Fucking With Functional Code To Make One Obscure Feature Work Better
@Ediblebomb Ediblebomb requested a review from fira December 4, 2023 21:09
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Changes appear to work in game other than the runtime that one of my suggestions caused. By the way, the suggestions I've been making you can just add to batch and apply rather than doing changes manually.

code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar added this pull request to the merge queue Dec 6, 2023
Merged via the queue into cmss13-devs:master with commit 27bfef6 Dec 6, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 6, 2023
@Ediblebomb Ediblebomb deleted the Gasmask branch December 6, 2023 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants