search

Vault-Overseers / nuclear-14

Multiplayer survival role-playing game set in a post-nuclear apocalyptic world
https://nuclear14.com
GNU Affero General Public License v3.0
50 stars 99 forks source link

Blue line drip quick-fix #699

Closed the-adom closed 1 week ago

the-adom commented 1 week ago

made this mistake b4, prolly make it again

github-actions[bot] commented 1 week ago

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

github-actions[bot] commented 1 week ago

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

Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-right.png) | Added

Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-right.png) | Added

Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-right.png) | Added

Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/icon.png) | Added

Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/icon.png) | Added

Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/the-adom/nuclear-14/b61dd631cd9488ea84285afe303a112b9c8732d4/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/icon.png) | Added