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

Fever Blossom changes, return of the bock, new canaanite preacher, more degeneracy nuked for Super Earth #96

Merged
merged 19 commits into from
Apr 25, 2024

Conversation

biotear
Copy link
Contributor

@biotear biotear commented Apr 19, 2024

About The Pull Request

Uncomments ballistic bock, changes the fermented form of fever blossom to a new drink called fever dream, changes fever blossom description to be less horny, and adds new reagents to fever blossom to replace the removed aphrodisiacs it had before. Doubles as a way to get med-x for battle brew that doesn't require CBT fermichem or tribal girl pukies filtering.

Now also nukes the furshit bottle from one of the preacher loadouts, and gives them a new canaanite loadout with 10 M1911s so they can larp as the burned man. All as Joseph Smith intended...

Pre-Merge Checklist

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

Changelog

🆑
add: fever dream
add: new canaanite loadout for preacher
tweak: ballistic bock
tweak: fever blossom
tweak: replaces the wataur bottle for preacher samaritan with a third water bottle.
/:cl:

@biotear biotear changed the title Fever Blossom changes, return of the bock Fever Blossom changes, return of the bock, more degeneracy nuked for Super Earth Apr 19, 2024
@biotear biotear changed the title Fever Blossom changes, return of the bock, more degeneracy nuked for Super Earth Fever Blossom changes, return of the bock, new canaanite preacher, more degeneracy nuked for Super Earth Apr 19, 2024
@Aurrain
Copy link
Contributor

Aurrain commented Apr 19, 2024

bock

@biotear
Copy link
Contributor Author

biotear commented Apr 19, 2024

bock

ZAX, play the Robot Chicken song.

Anyway not sure what's causing the linters.

Aurrain
Aurrain previously approved these changes Apr 19, 2024
Copy link
Contributor

@Aurrain Aurrain left a comment

Choose a reason for hiding this comment

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

Works now.

code/modules/jobs/job_types/wasteland.dm Outdated Show resolved Hide resolved
Shit's supposed to be a freshly nuked plant so it makes sense. Also an additional deterrent from powergaming by eating wild ones mid-combat.
@biotear
Copy link
Contributor Author

biotear commented Apr 20, 2024

if all checks pass, this is ready to be merged.

@Aurrain Aurrain merged commit fc6d126 into Foundation-19:master Apr 25, 2024
6 of 7 checks passed
Aurrain added a commit that referenced this pull request Apr 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants