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

Add emergency flares #15797

Merged
merged 15 commits into from Sep 29, 2023
Merged

Add emergency flares #15797

merged 15 commits into from Sep 29, 2023

Conversation

flappybatpal
Copy link
Contributor

@flappybatpal flappybatpal commented Sep 11, 2023

About the PR

Adds an emergency flare item, the more serious alternative to the glowstick which is also an ignition source!
Implements a loctargeting medium light component
3-6 minute duration with particle fx.
Won't fit in a pocket or storage after ignition.
Sprites by Flaborized.

Why's this needed?

I think in power outages or exploration these will be quite fun compared to glowsticks or flashlights.

Changelog

(u)Flappybat & Flaborized
(*)Adds emergency flares to the game, when a glowstick just won't cut it! These come as standard issue in emergency toolboxes. Just be careful around flammable gas...

@flappybatpal flappybatpal added C-Feature A new feature or enhancements to existing features A-Game-Objects The point of this PR is to deal with a specific game object labels Sep 11, 2023
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Sep 11, 2023
@flappybatpal flappybatpal marked this pull request as draft September 11, 2023 20:32
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 11, 2023
@CheffieGithub
Copy link
Contributor

Are there plans to increase their range under the Fix light, which is barely visible except in the dark. task?

image

While brighter I feel it should be larger than the PDA light is

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 20, 2023
@flappybatpal
Copy link
Contributor Author

image

Meidum light component go!

@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 21, 2023
@flappybatpal flappybatpal marked this pull request as ready for review September 21, 2023 20:51
@flappybatpal flappybatpal removed the request for review from pali6 September 21, 2023 21:24
@flappybatpal flappybatpal added the E-Add-To-Wiki A PR that will require changes to the wiki label Sep 21, 2023
Copy link
Member

@frawhst frawhst left a comment

Choose a reason for hiding this comment

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

Maybe also replace the glow sticks in the emergency crate from cargo with these.

code/obj/item/device/lights.dm Outdated Show resolved Hide resolved
code/obj/item/device/lights.dm Show resolved Hide resolved
code/datums/components/simplelight.dm Outdated Show resolved Hide resolved
code/obj/item/cigarette.dm Outdated Show resolved Hide resolved
code/obj/item/device/lights.dm Outdated Show resolved Hide resolved
code/obj/item/device/lights.dm Outdated Show resolved Hide resolved
code/obj/item/device/lights.dm Outdated Show resolved Hide resolved
@flappybatpal flappybatpal merged commit 54f0c1f into goonstation:master Sep 29, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Sep 29, 2023
@Studenterhue Studenterhue removed the E-Add-To-Wiki A PR that will require changes to the wiki label Oct 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants