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

Trickwines! Part 2! #2166

Merged
merged 78 commits into from
Nov 14, 2023
Merged

Trickwines! Part 2! #2166

merged 78 commits into from
Nov 14, 2023

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Jul 14, 2023

About The Pull Request

A set of 3 new trick wines following the same concepts of the originals!
Prismwine, Forcewine, and Hearthwine!
Also makes trickwines made in a distiller which can only be found on srm ships
More information about them are here
https://hackmd.io/@1AmYOEuoR22oazvD5KVcDg/rJTEL1DM3

Adds new lovely sprites done by stiel0248
This also fixes a lot of minor issues with the original pr and shifts the code into separate files!

Also to prevent trickwines from being abused in smoke grenades, smoke is now separate from TOUCH = method

Why It's Good For The Game

Trickwines are fun!
I love Trickwines!
The new sprites are alot better!
This tweaks em to be harder to obtain makes them more varied and balanced as well

Changelog

🆑
add: 3 new Trickwines! Prism, Hearth, and Force
tweak: tweaked the old Trickwines to be slightly more balanced
add: srm tree and Trickwine distiller
tweak: copy big mortar code to small mortar so you can chose between grinding and juicing
refactor: splits smoke flags for more control over chemical reactions
server: Blackbox now records more info about chems
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jul 14, 2023
@FalloutFalcon
Copy link
Member Author

image
Thanks to stiel for replacing my doodoo coder sprites

@FalloutFalcon FalloutFalcon marked this pull request as ready for review July 31, 2023 08:49
@FalloutFalcon FalloutFalcon requested review from a team as code owners July 31, 2023 08:49
Copy link
Contributor

@tmtmtl30 tmtmtl30 left a comment

Choose a reason for hiding this comment

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

Seems functional; I just have some balance and coding style nitpicks.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 25, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. Map Change Tile placing is hard. Thank you for your service. labels Oct 29, 2023
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Oct 29, 2023
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 13, 2023
@thgvr
Copy link
Member

thgvr commented Nov 14, 2023

Fix your conflicts

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 14, 2023
@FalloutFalcon
Copy link
Member Author

i did that wrong

Signed-off-by: FalloutFalcon <[email protected]>
Signed-off-by: FalloutFalcon <[email protected]>
@FalloutFalcon
Copy link
Member Author

doneeee

@thgvr thgvr dismissed tmtmtl30’s stale review November 14, 2023 17:19

All of the review has been addressed

@FalloutFalcon
Copy link
Member Author

pipebomb
joyus

@thgvr thgvr added this pull request to the merge queue Nov 14, 2023
Merged via the queue into shiptest-ss13:master with commit f184346 Nov 14, 2023
10 checks passed
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 14, 2023
@FalloutFalcon FalloutFalcon deleted the trickwine-2 branch December 18, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin They do it for free. Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants