-
Notifications
You must be signed in to change notification settings - Fork 297
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
nukie medic medical medhud #779
Conversation
Signed-off-by: JoeHammad1844 <[email protected]>
RSI Diff Bot; head commit 44777ad merging into 8183085 Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi
|
Signed-off-by: JoeHammad1844 <[email protected]>
#707 lmao |
Superseded by #707 |
please re-open if the other one goes stale |
can this PR be re-openned? the other one went down |
we're back |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: JoeHammad1844 <[email protected]>
Signed-off-by: JoeHammad1844 <[email protected]>
Signed-off-by: JoeHammad1844 <[email protected]>
Signed-off-by: JoeHammad1844 <[email protected]>
Signed-off-by: JoeHammad1844 <[email protected]>
okay what the fuck, i need some help here |
Sure, I'll help out with this. I merged a PR that touches the same files as this, which makes a merge conflict. This periodically happens in any project like this, and isn't something to worry about all that much. Another PR that was merged added the PrescriptionHudSecurity and PrescriptionMedHud items to the same file you were working with in this PR. To resolve the merge conflict, you simply need to rearrange the file so that your new item fits in it with the other new items that were added. |
i knew all that and i tried that |
Signed-off-by: VMSolidus <[email protected]>
I got it for you, it's all good |
Signed-off-by: VMSolidus <[email protected]>
thanks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll leave this for @VMSolidus to judge and merge
About the PR
nuclear operative medics now have combination syndicate/medical hud
Why / Balance
they need it
Media
Changelog
🆑 JoeHammad