search

crystallpunk-14 / crystall-punk-14

A cooperative role-playing game about an expedition to the lands of Khorvaire. Based on the game Space Station 14.
https://discord.gg/Sud2DMfhCC
Other
22 stars 27 forks source link

Upstream sync #301

Closed TheShuEd closed 4 days ago

TheShuEd commented 4 days ago

displacement maps fix! gobliins and dwarfs now playable!

github-actions[bot] commented 4 days ago

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

Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING-vox | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING-vox.png) | Added | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-right.png) | Added

Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-right.png) | Added

Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi

| State | Old | New | Status | --- | --- | --- | --- | | color-equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/color-equipped-INNERCLOTHING.png) | Added | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/equipped-INNERCLOTHING.png) | Added | icon-color | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon-color.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-right.png) | Added

Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi

| State | Old | New | Status | --- | --- | --- | --- | | color-equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/color-equipped-INNERCLOTHING.png) | Added | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/equipped-INNERCLOTHING.png) | Added | icon-color | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon-color.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-right.png) | Added

Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi

| State | Old | New | Status | --- | --- | --- | --- | | color-equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/color-equipped-INNERCLOTHING.png) | Added | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/equipped-INNERCLOTHING.png) | Added | icon-color | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon-color.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/crystallpunk-14/crystall-punk-14/b1a2aaf1f5c8ef07348d6d4075b9866441672ac1/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon.png) | Added