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 files via upload #367

Merged
merged 14 commits into from
Feb 22, 2024
Merged

Add files via upload #367

merged 14 commits into from
Feb 22, 2024

Conversation

biotear
Copy link
Contributor

@biotear biotear commented Jan 30, 2024

About The Pull Request

[TO BE TESTMERGED] Fixes some code bugs for juicing, fixes a sprite bug on the PLA field cap, adds a new chem (radshield) to counter tritium griefing by decontaminating objects and to serve as a refined radaway that trades some of the anti-toxin for more anti-rad, and finally makes nukashine closer to how it works in Fallout 76 as well as adding a reworked version of red queen (as a treat).

Why It's Good For The Game

This is good as the bugged juicing disabled a decent number of recipes that required the juices, the PLA field cap was just a flatout bug that needed fixing, nukashine is more lore accurate with the blackout effect, red queen, admittedly, I just think has a cool sprite and wanted it back, and radshield will allow for decontamination of objects effected by the funny tritium plasma bombings (desperately needed with the griefing issues as of late)

I've decided to elaborate a bit on Red Queen's new OD. It induces hypnotic stupor brain trauma. You can fix it with basic brain surgery. Now, I understand MK Ultra was removed due to ERP and abuse concerns, and have no intention of adding it back. Hypnotic stupor trauma, unlike MK Ultra, procs trance states at random. Every new command overwrites the last, meaning you can't actually abuse this for, say, forcing people to join you or do bannable acts with you (this isn't the furry server, damn it). Basically, it's just minor annoyance that any surgeon can remove and you'd need to chug a large beaker of the stuff just to OD. I chose hypnotic stupor over another trauma as I felt it best kept with the Alice in Wonderland theme of the drink while negating hitbox issues from the previous resizing. If this is an issue, It can be changed to hallucinations or the OD removed entirely.

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑ThottieRisette
-adds radshield reagent and recipe
-readds missing juices for Fallout plants
-reenables red queen
-changes red queen's effect to remove resizing
-nukashine now makes you sleep upon wearing off
-added overdose effect to red queen to replace the resizing (it requires 120u in your system at once, so not something easy to accidently manage)
-fixes bugged grinding and juicing for plants (I swear I feel like it was sabotaged at some point with how many were set to 0)
-minor tweaks to some drink recipes
-fixes sprite bug for PLA field cap
/:cl:

-adds radshield reagent and recipe
-readds missing juices for Fallout plants
-reenables red queen
-changes red queen's effect to remove resizing
-nukashine now makes you sleep upon wearing off
-added overdose effect to red queen to replace the resizing (it requires 120u in your system at once, so not something easy to accidently manage)
-fixes bugged grinding and juicing for plants (I swear I feel like it was sabotaged at some point with how many were set to 0)
-minor tweaks to some drink recipes
-fixes sprite bug for PLA field cap
@Aurrain
Copy link
Contributor

Aurrain commented Feb 3, 2024

Seems to be failing a linter check related to some yog-code annotations, I'll attach a screenshot of what it shows:
image

@Aurrain Aurrain added Enhancement New feature or request Flavor Town This PR deals with flavor text as it's focus Bug Fix this PR deals with one ore more bug labels Feb 3, 2024
@biotear
Copy link
Contributor Author

biotear commented Feb 3, 2024

Seems to be failing a linter check related to some yog-code annotations, I'll attach a screenshot of what it shows: image

Weird. Not sure what's doing that, I'll take a look in a bit.

@biotear
Copy link
Contributor Author

biotear commented Feb 3, 2024

Seems to be failing a linter check related to some yog-code annotations, I'll attach a screenshot of what it shows: image

Linters seem to be fixed. I asked pokee to help me find the issue, and it was sorted out.

@OliOliOnsiPree
Copy link
Contributor

So what this does is, if you check via PR on github desktop or whatever you use, it makes it all in the big-iron files itself, not in the folders were hydroponics should be. So what this PR will do is add multiple cases of the same hydroponics what would be duplicated.

@biotear
Copy link
Contributor Author

biotear commented Feb 3, 2024

So what this does is, if you check via PR on github desktop or whatever you use, it makes it all in the big-iron files itself, not in the folders were hydroponics should be. So what this PR will do is add multiple cases of the same hydroponics what would be duplicated.

Sorry, been a while since I've done a PR. I uploaded through my browser, so, I forgot it doesn't automatically overwrite the files. Dumb in hindsight, but my brain was a bit fried at the time. I'll get back to you once I sort it out.

@biotear
Copy link
Contributor Author

biotear commented Feb 3, 2024

So what this does is, if you check via PR on github desktop or whatever you use, it makes it all in the big-iron files itself, not in the folders were hydroponics should be. So what this PR will do is add multiple cases of the same hydroponics what would be duplicated.

Alright, problem solved. Sorry for making such a stupid mistake there.

@ErwinSnowden
Copy link
Contributor

Tomoko Maus change? -1. Just more powergame content. This is me giving my thumbs down: 👎 Got it?

@biotear
Copy link
Contributor Author

biotear commented Feb 18, 2024

Testmerge seems to have been fine. We can full merge whenever you guys want.

@Aurrain Aurrain merged commit 7389f20 into Foundation-19:master Feb 22, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Fix this PR deals with one ore more bug Enhancement New feature or request Flavor Town This PR deals with flavor text as it's focus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants