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

[HELP ME HOLY SHIT please TESTMERGE THIS] Hemophages! #91

Merged
merged 15 commits into from
Sep 28, 2024

Conversation

Nerev4r
Copy link
Collaborator

@Nerev4r Nerev4r commented Sep 24, 2024

About The Pull Request

Hemophages! Featuring changes from Yooriss's hemophage PR, featuring the change where you get a perma mood buff from killing people. Most code by Golden from Nova.

Why It's Good For The Game

Blood!!!

Changelog

🆑
add: Hemophages!
/:cl:

@Nerev4r Nerev4r marked this pull request as draft September 24, 2024 02:53
@Nerev4r Nerev4r marked this pull request as ready for review September 25, 2024 02:19
@Nerev4r Nerev4r changed the title [HELP ME HOLY SHIT DO NOT TESTMERGE THIS] Hemophages! [HELP ME HOLY SHIT please TESTMERGE THIS] Hemophages! Sep 25, 2024
Copy link

@CliffracerX CliffracerX left a comment

Choose a reason for hiding this comment

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

Couple nitpicks with missing edit markers & such that need resolved, but otherwise this is looking good!

code/__DEFINES/~doppler_defines/DNA.dm Outdated Show resolved Hide resolved
code/__DEFINES/food.dm Outdated Show resolved Hide resolved
code/__DEFINES/food.dm Show resolved Hide resolved
code/__DEFINES/food.dm Show resolved Hide resolved
code/_globalvars/traits/_traits.dm Outdated Show resolved Hide resolved
… into vampiretherequiem

# Conflicts:
#	tgstation.dme
@carpotoxin carpotoxin merged commit a87b853 into DopplerShift13:master Sep 28, 2024
21 checks passed
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