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.

Sign up for GitHub

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

Jump to bottom

Smoke Flamer #6146

Merged
merged 11 commits into from
May 10, 2024
Merged

Smoke Flamer #6146

merged 11 commits into from
May 10, 2024

Conversation

iloveloopers
Copy link
Contributor

@iloveloopers iloveloopers commented Apr 14, 2024 •
edited
Loading

About the pull request

adds a new flamer fuel tank that turns any reagent inside into chemsmoke when fired
fuel tank obtainable from army lathe (OT lathe)
only 1 reagent allowed inside the tank so its not overpowered
cannot be used with the nozzle
the smoke will always have a set ammount of units in it (somewhat high) so that it works effectively with the on_touch reactions

Explain why it's good for the game

more flamer fuel variety
new ways to apply anti-xeno chems

Testing Photographs and Procedure

https://www.youtube.com/watch?v=ePTXqXiK330

Changelog

🆑
add: Adds in a new incinerator smoke tank that turns any reagent inside it into chemsmoke when fired.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Apr 14, 2024
@deathrobotpunch
Copy link
Contributor

OT’s will be foaming at the mouth with their new ability to make cheese flamethrowers

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 19, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@iloveloopers
Copy link
Contributor Author

oops

@iloveloopers iloveloopers reopened this Apr 19, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 19, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@iloveloopers iloveloopers marked this pull request as ready for review April 19, 2024 16:53
Drulikar
Drulikar requested changes Apr 24, 2024
View reviewed changes
code/modules/projectiles/guns/flamer/flamer.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun_attachables.dm Outdated Show resolved Hide resolved
code/modules/projectiles/magazines/flamer.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft April 24, 2024 03:26
@iloveloopers iloveloopers marked this pull request as ready for review April 24, 2024 03:36
@Drulikar Drulikar added Testmerge Candidate we'll test this while you're asleep and the server has 10 players Needs Testing Need to test it on the guinea pigs (production server) Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Apr 24, 2024
cm13-github added a commit that referenced this pull request Apr 24, 2024
@cm13-github
TGS Test Merge (#6146)
6ac7068
@PurpleCIoud PurpleCIoud mentioned this pull request Apr 24, 2024
Closed
3 tasks
cm13-github added a commit that referenced this pull request May 2, 2024
@cm13-github
TGS Test Merge (#6146)
efe6c07
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 3, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label May 3, 2024
cm13-github added a commit that referenced this pull request May 3, 2024
@cm13-github
TGS Test Merge (#6146)
7332b90
@AudiGzz AudiGzz mentioned this pull request May 4, 2024
Closed
3 tasks
cm13-github added a commit that referenced this pull request May 5, 2024
@cm13-github
TGS Test Merge (#6146)
5dae622
cm13-github added a commit that referenced this pull request May 5, 2024
@cm13-github
TGS Test Merge (#6146)
db239b8
cm13-github added a commit that referenced this pull request May 5, 2024
@cm13-github
TGS Test Merge (#6146)
84175f1
cm13-github added a commit that referenced this pull request May 6, 2024
@cm13-github
TGS Test Merge (#6146)
0895854
cm13-github added a commit that referenced this pull request May 6, 2024
@cm13-github
TGS Test Merge (#6146)
7d2c846
cm13-github added a commit that referenced this pull request May 7, 2024
@cm13-github
TGS Test Merge (#6146)
1851369
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6146)
5a634a9
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6146)
49e586a
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6146)
c1dbe8f
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6146)
2b43a7a
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6146)
54c5fa8
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label May 9, 2024
cm13-github added a commit that referenced this pull request May 9, 2024
@cm13-github
TGS Test Merge (#6146)
e278325
cm13-github added a commit that referenced this pull request May 9, 2024
@cm13-github
TGS Test Merge (#6146)
6de7f23
cm13-github added a commit that referenced this pull request May 9, 2024
@cm13-github
TGS Test Merge (#6146)
d72b678
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
TGS Test Merge (#6146)
c87cc42
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
TGS Test Merge (#6146)
66a8917
Drulikar
Drulikar approved these changes May 10, 2024
View reviewed changes
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.

I've not been made aware of any issues with this PR nor has it received any player feedback, but should something come up feel free to open another PR.

@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label May 10, 2024
@Drulikar Drulikar added this pull request to the merge queue May 10, 2024
Merged via the queue into cmss13-devs:master with commit bc1ffe8 May 10, 2024
27 checks passed
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
Automatic changelog for PR #6146 [ci skip]
4b53d3c
@iloveloopers iloveloopers deleted the SMOKE-FLAMER branch May 24, 2024 05:11
@iloveloopers iloveloopers mentioned this pull request Sep 24, 2024
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

Assignees
No one assigned
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Needs Testing Need to test it on the guinea pigs (production server) Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@iloveloopers @deathrobotpunch @cm13-github @Skatuk @Drulikar