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

Adding new hud glasses and fixing rsi shit #56

Merged
merged 8 commits into from
Sep 19, 2024
Merged

Adding new hud glasses and fixing rsi shit #56

merged 8 commits into from
Sep 19, 2024

Conversation

Creatorbot01
Copy link
Collaborator

@Creatorbot01 Creatorbot01 commented Sep 13, 2024 •
edited
Loading

fucked up a bit and just close the previous pull cause im an idiot who forgot how to push shit
anyway

🆑

  • add: Added two new HUD glasses, medical and medsec

ADMIN:

  • add: Added "centcom glasses", HUD sunglasses that provide welding protection as well as all three HUD types

@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code. labels Sep 13, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 13, 2024 •
edited
Loading

RSI Diff Bot; head commit 5afdab0 merging into 44a5fdf
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Eyes/Glasses/crglasses.rsi

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

Resources/Textures/Clothing/Eyes/Glasses/medglasses.rsi

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

Resources/Textures/Clothing/Eyes/Glasses/medsecglasses.rsi

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

Edit: diff updated after 5afdab0

@Creatorbot01
Copy link
Collaborator Author

nice removing the warden winter coat that rsi scream about work. it should be fine since wizden also didnt have the folder for it anyway.

@Creatorbot01 Creatorbot01 added Status: Needs Review This PR requires new reviews before it can be merged. and removed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Sep 13, 2024
TheDoctor1977
TheDoctor1977 requested changes Sep 13, 2024
View reviewed changes
Copy link
Member

@TheDoctor1977 TheDoctor1977 left a comment

Choose a reason for hiding this comment

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

standardize please

@TheDoctor1977 TheDoctor1977 added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Sep 13, 2024
@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Sep 18, 2024
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Sep 18, 2024
TheDoctor1977
TheDoctor1977 reviewed Sep 19, 2024
View reviewed changes
Copy link
Member

@TheDoctor1977 TheDoctor1977 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

going to see if i can just force fix this tiny grammar issue from my end

edit: yup!

@TheDoctor1977
Copy link
Member

i can go ahead and merge this now or it can wait until you add crafting recipes for them

@Creatorbot01 Creatorbot01 merged commit 32eba7d into The-Arcadis-Team:master Sep 19, 2024
9 of 13 checks passed
@Creatorbot01 Creatorbot01 deleted the GLASSSESSSSS branch September 19, 2024 06:48
@Creatorbot01
Copy link
Collaborator Author

nah im just gonna merge it. i can make another pr to add crafting recipe later

@Creatorbot01 Creatorbot01 restored the GLASSSESSSSS branch September 19, 2024 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheDoctor1977 TheDoctor1977 TheDoctor1977 requested changes

Assignees
No one assigned
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Creatorbot01 @TheDoctor1977