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

Coffee machines for all Galactic Conquest maps & Syndicate coffee mood #2576

Merged
merged 2 commits into from
Nov 10, 2023

Conversation

someone543
Copy link
Contributor

@someone543 someone543 commented Nov 3, 2023

About The Pull Request

Adds coffee machines to all PVP maps and alters the mood event depending on the drinkers faction

Why It's Good For The Game

The Syndicate shouldn't want to blow themselves up whenever they drink coffee.

Testing Photographs and Procedure

Screenshots&Videos Dark Astraeus

SPACEcoffee

Babylon

BabyCoffee

BabyCoffee3

Hammurabi

HammurabiCoffee

Mood event

SyndiCoffee

Changelog

🆑
add: Added coffee machines to PVP ships
tweak: Syndicate coffee drinkers now get a altered mood event
/:cl:

@Bobbanz1
Copy link
Contributor

Bobbanz1 commented Nov 3, 2023

I now realized that I never thought about the Syndicate getting their hands on naval coffee back when I added the mood event for this stuff, also no premium coffee makers for the syndies?

Copy link
Contributor

@Bokkiewokkie Bokkiewokkie left a comment

Choose a reason for hiding this comment

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

Looks like you accidentally put some coffee in the southern Babylon cafeteria wall

@someone543
Copy link
Contributor Author

Looks like you accidentally put some coffee in the southern Babylon cafeteria wall

Oops. Fixed.

I now realized that I never thought about the Syndicate getting their hands on naval coffee back when I added the mood event for this stuff, also no premium coffee makers for the syndies?

Unacceptable. Fixed, the Babylon now exclusively has it in the bridge.

@Bokkiewokkie Bokkiewokkie merged commit 5d223fc into BeeStation:master Nov 10, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants