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

Update. #117

Merged
merged 9 commits into from
Oct 26, 2024
Merged

Update. #117

merged 9 commits into from
Oct 26, 2024

Conversation

Merrokitsune
Copy link
Collaborator

Pull request to pull updates, due to merge conflict.

Copy link

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

@github-actions github-actions bot added S: Merge Conflict Status: Merge conflicts need to be resolved. Changes: Sprites Changes: Might require knowledge of spriting. Changes: Map Changes: Might require knowledge of mapping. labels Oct 26, 2024
Copy link

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

Resources/Textures/Ronstation/Clothing/Head/Helmets/heccdiver.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/Neck/Cloaks/heccdiver.rsi

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

Resources/Textures/Ronstation/Clothing/OuterClothing/Hardsuits/heccdiver.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Clothing/Uniforms/Jumpsuit/heccdiver.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Ronstation/Objects/Devices/pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda-heccdiver Added
pda Added

Resources/Textures/Ronstation/Objects/Devices/terragovhandy.rsi

State Old New Status
walkietalkie-inhand-left Added
walkietalkie-inhand-right Added
walkietalkie-off Added
walkietalkie-on Added
walkietalkie Added

Resources/Textures/Ronstation/Objects/Misc/id_cards.rsi

State Old New Status
heccdiver-inhand-left Added
heccdiver-inhand-right Added
heccdiver Added

@github-actions github-actions bot removed the S: Merge Conflict Status: Merge conflicts need to be resolved. label Oct 26, 2024
@GitHubUser53123
Copy link
Collaborator

good to merge?

@Merrokitsune
Copy link
Collaborator Author

@GitHubUser53123, everything looks good. Can be merged.

@GitHubUser53123 GitHubUser53123 merged commit ede3308 into master Oct 26, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Changes: Might require knowledge of mapping. Changes: Sprites Changes: Might require knowledge of spriting.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants