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.

Sign up for GitHub

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

Jump to bottom

nukie medic medical medhud #779

Merged
merged 10 commits into from
Mar 8, 2024
Merged

nukie medic medical medhud #779

merged 10 commits into from
Mar 8, 2024

Conversation

JoeHammad1844
Copy link
Contributor

About the PR

nuclear operative medics now have combination syndicate/medical hud

Why / Balance

they need it

Media

image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑 JoeHammad

  • add: Nuclear operative combat medics now have combination syndicate/medical hud

@JoeHammad1844
nukie medhud
aa17d8d 
Signed-off-by: JoeHammad1844 <[email protected]>
@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Feb 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 4, 2024 •
edited
Loading

RSI Diff Bot; head commit 44777ad merging into 8183085
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 44777ad

@JoeHammad1844
Copy link
Contributor Author

#707 lmao

@JoeHammad1844 JoeHammad1844 mentioned this pull request Feb 10, 2024
Closed
1 task
@DebugOk
Copy link
Contributor

DebugOk commented Feb 10, 2024

Superseded by #707

@DebugOk DebugOk closed this Feb 10, 2024
@JoeHammad1844
Copy link
Contributor Author

please re-open if the other one goes stale :trollface:

@JoeHammad1844
Copy link
Contributor Author

Superseded by #707

can this PR be re-openned? the other one went down

@VMSolidus VMSolidus reopened this Feb 12, 2024
@JoeHammad1844
Copy link
Contributor Author

we're back

@JoeHammad1844 JoeHammad1844 changed the title nukie medhud nukie medic medical medhud Feb 13, 2024
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Mar 1, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 1, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@JoeHammad1844
should solve conflict
7273348 
Signed-off-by: JoeHammad1844 <[email protected]>
@JoeHammad1844
that took too long to fix
51bd20c 
Signed-off-by: JoeHammad1844 <[email protected]>
@JoeHammad1844
Update hud.yml
ffcfbd1 
Signed-off-by: JoeHammad1844 <[email protected]>
@JoeHammad1844
hmmm
92cd73e 
Signed-off-by: JoeHammad1844 <[email protected]>
@JoeHammad1844
might fix it
c91b338 
Signed-off-by: JoeHammad1844 <[email protected]>
@JoeHammad1844
Copy link
Contributor Author

okay what the fuck, i need some help here

@VMSolidus
Copy link
Contributor

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.

@JoeHammad1844
Copy link
Contributor Author

i knew all that and i tried that

@VMSolidus
Copy link
Contributor

I got it for you, it's all good

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Mar 2, 2024
@VMSolidus
Update hud.yml
44777ad 
Signed-off-by: VMSolidus <[email protected]>
@JoeHammad1844
Copy link
Contributor Author

thanks

DebugOk
DebugOk reviewed Mar 7, 2024
View reviewed changes
Copy link
Contributor

@DebugOk DebugOk left a 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

@VMSolidus VMSolidus merged commit 9dbb2eb into DeltaV-Station:master Mar 8, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Mar 8, 2024
Automatic Changelog Update (#779)
3684aa2
@JoeHammad1844 JoeHammad1844 deleted the nukie-medhud branch March 8, 2024 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DebugOk DebugOk DebugOk left review comments

@VMSolidus VMSolidus VMSolidus approved these changes

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JoeHammad1844 @DebugOk @VMSolidus