Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Updated epi clothes, Sophic Grammateus sprite, and new cocktail Dulleavene #90

Merged
merged 12 commits into from
Jul 23, 2023

Conversation

leonardo-dabepis
Copy link
Contributor

About the PR

Changes the acolyte and mystagogue robes, adds a cloak for mystagogue, adds a sprite for the Sophic Grammateus, and adds a new cocktail called dulleavene

Media

image

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

Changelog

🆑 Leonardo-DaBepis

  • add: added cloak for mystagogue, new Sophic Grammateus sprite, new cocktail dulleavene.
  • tweak: Changed the sprites for the acolyte and mystagogue robes.

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi No C# labels Jul 19, 2023
@github-actions
Copy link

github-actions bot commented Jul 19, 2023

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

Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/mystic.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Robes/white.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Structures/Decoration/statues.rsi

State Old New Status
oracle-0 Added
oracle-1 Added
oracle-10 Added
oracle-2 Added
oracle-3 Added
oracle-4 Added
oracle-5 Added
oracle-6 Added
oracle-7 Added
oracle-8 Added
oracle-9 Added
sophie Added

Edit: diff updated after a4aabcb

@DebugOk
Copy link
Contributor

DebugOk commented Jul 19, 2023

Phil PR real!!1!

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.

When changing Nyano sprites, I think we should go for the approach of making a new sprite in the DeltaV namespace, instead of replacing files. (I'm guilty of this too with the Oracle:blunt:)

@leonardo-dabepis
Copy link
Contributor Author

When changing Nyano sprites, I think we should go for the approach of making a new sprite in the DeltaV namespace, instead of replacing files. (I'm guilty of this too with the Oracle:blunt:)

I learned it from you :elp:
Do you want me to just make a new folder in DeltaV and redirect the .yml files there?

@DebugOk
Copy link
Contributor

DebugOk commented Jul 19, 2023

When changing Nyano sprites, I think we should go for the approach of making a new sprite in the DeltaV namespace, instead of replacing files. (I'm guilty of this too with the Oracle:blunt:)

I learned it from you :elp:
Do you want me to just make a new folder in DeltaV and redirect the .yml files there?

Pretty much. It can be all the same, except you have the files in /Textures/DeltaV or whatever it was. The .yml file shouldn't be moved, though. Only the sprites.

@leonardo-dabepis
Copy link
Contributor Author

When changing Nyano sprites, I think we should go for the approach of making a new sprite in the DeltaV namespace, instead of replacing files. (I'm guilty of this too with the Oracle:blunt:)

I learned it from you :elp:
Do you want me to just make a new folder in DeltaV and redirect the .yml files there?

Pretty much. It can be all the same, except you have the files in /Textures/DeltaV or whatever it was. The .yml file shouldn't be moved, though. Only the sprites.

Ok, I think I changed the sprite folder correctly. Did I?

@DebugOk
Copy link
Contributor

DebugOk commented Jul 19, 2023

I'll check when I get back on my pc

@DebugOk DebugOk self-requested a review July 19, 2023 22:37
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 19, 2023
@github-actions
Copy link

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 20, 2023
@DebugOk
Copy link
Contributor

DebugOk commented Jul 20, 2023

The robes should also be moved, and 2 merge conflicts have popped up on your branch which will need to be resolved first.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 21, 2023
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.

Checked in game, all looks good, except a weird space in the sophic prototype, however this doesnt matter as it'll be updated again soon to replace the npc dialogue tree. If tests pass I'll merge

@DebugOk
Copy link
Contributor

DebugOk commented Jul 22, 2023

Tests failed
Merging can be performed automatically.

I'll take it. The failures are unrelated anyways. Trying one more time and then I'll just merge it if its the exact same thing again

@DebugOk DebugOk merged commit 7b9e175 into DeltaV-Station:master Jul 23, 2023
8 of 9 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Jul 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changes: Sprite Changes any png or json in an rsi Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants