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

amourgus + xtras #12844

Merged
merged 3 commits into from
Apr 26, 2021
Merged

amourgus + xtras #12844

merged 3 commits into from
Apr 26, 2021

Conversation

illusineer
Copy link
Contributor

Changelog

🆑
add: amogus
add: amojoust in det office and maint
add: amojus as heirloom item for jobs not assigned heirloom
add: amogert traitor item
fix: fixed typo in syndie surgery bag uplink item
add: robotnik mustache facial hair option
add: exclamation mohawk hair option
tweak: unce machine begins off roundstart (DAMN THAT IS ANNOYING!!)
add: 4 new fart messages
/:cl:

About The Pull Request

tenor (3)

Why It's Good For The Game

amongos
tenor (4)

@carlopault
Copy link
Contributor

+1 all of this stuff looks really neat. @yoyobatty merge dis

@@ -353,7 +360,7 @@
if(mood_message in vowbroken_message)
mood_message = null
cheer_up()

// gay ^^^
Copy link
Contributor

Choose a reason for hiding this comment

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

no

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea

add (bruteloss) to imposter suicideact
2 init to 1
@illusineer illusineer requested a review from yoyobatty April 26, 2021 19:28
@yoyobatty yoyobatty merged commit 658bde5 into HippieStation:master Apr 26, 2021
Bondle added a commit to station-ss13/stationeer that referenced this pull request Aug 5, 2021
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.

3 participants