search

SS14-Classic / deep-station-14

GNU Affero General Public License v3.0
8 stars 21 forks source link

Upstream Merge 6 22 2024 #26

Closed VMSolidus closed 3 months ago

VMSolidus commented 3 months ago

Now featuring:

Updates to Height Sliders Trait Point System Latent Psychic Trait now costs Trait Points ARACHNE ARE BACK MASS CONTESTS ARE BACK Loadout Items Update

github-actions[bot] commented 3 months ago

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

github-actions[bot] commented 3 months ago

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

Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi

| State | Old | New | Status | --- | --- | --- | --- | | peacock_tail_eyes | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/deep-station-14/7255f1dd4ac4069b9cf52717bfd5f3d96e8a554b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png) | Added | peacock_tail_feathers | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/deep-station-14/7255f1dd4ac4069b9cf52717bfd5f3d96e8a554b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png) | Added

Edit: diff updated after 7255f1dd4ac4069b9cf52717bfd5f3d96e8a554b