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

Added Saltern and Cluster Reskin and Rework V0.4 #26248

Closed
wants to merge 5 commits into from
Closed

Added Saltern and Cluster Reskin and Rework V0.4 #26248

wants to merge 5 commits into from

Conversation

Arkyfloof
Copy link

About

-Syndified Cluster
-Syndified Saltern
-Reworked some of Saltern

Version 0.4

@ss14-mapserver-beta SS14.MapServer Beta
Copy link

ss14-mapserver-beta bot commented Mar 18, 2024 •
edited
Loading

This PR contains new or changed maps:

Saltern

image

03/27/24 13:43

@github-actions github-actions bot added Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Status: Needs Review This PR requires new reviews before it can be merged. No C# For things that don't need code. labels Mar 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 18, 2024 •
edited
Loading

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

Resources/Textures/Clothing/Back/Backpacks/syndicatecap.rsi

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

Resources/Textures/Clothing/Hands/Gloves/syndicatecap.rsi

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

Edit: diff updated after c9b87ca

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 18, 2024
@PursuitInAshes
Copy link
Contributor

Wrong repo by the looks?. Glad to see some work is still being done on that fork through. If this is the right repo, your branch is cooked, please try to fix it.

@Arkyfloof
Copy link
Author

I absolutely cooked my branch, keeps uploading into the wrong repo

@Arkyfloof Arkyfloof closed this Mar 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EmoGarbage404 EmoGarbage404 Awaiting requested review from EmoGarbage404 EmoGarbage404 is a code owner

Assignees
No one assigned
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Merge Conflict This PR currently has conflicts that need to be addressed. 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.
3 participants
@Arkyfloof @PursuitInAshes @Eagle-0