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
48 stars 95 forks source link

Close this pull idk why its so messed up have to fix it #477

Closed FizCap closed 2 months ago

FizCap commented 2 months ago

Syndi logo uses a lot of decal spots and won't be used on nuclear14 so I think it should be removed to help mappers and I also added my full white decal tiles to help recolor tiles

github-actions[bot] commented 2 months ago

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

github-actions[bot] commented 2 months ago

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

Resources/Textures/Decals/syndlogo.rsi

| State | Old | New | Status | --- | --- | --- | --- | | syndlogo1 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo1.png) | ![]() | Removed | syndlogo10 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo10.png) | ![]() | Removed | syndlogo11 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo11.png) | ![]() | Removed | syndlogo12 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo12.png) | ![]() | Removed | syndlogo13 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo13.png) | ![]() | Removed | syndlogo14 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo14.png) | ![]() | Removed | syndlogo15 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo15.png) | ![]() | Removed | syndlogo16 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo16.png) | ![]() | Removed | syndlogo17 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo17.png) | ![]() | Removed | syndlogo18 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo18.png) | ![]() | Removed | syndlogo19 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo19.png) | ![]() | Removed | syndlogo2 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo2.png) | ![]() | Removed | syndlogo3 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo3.png) | ![]() | Removed | syndlogo4 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo4.png) | ![]() | Removed | syndlogo5 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo5.png) | ![]() | Removed | syndlogo6 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo6.png) | ![]() | Removed | syndlogo7 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo7.png) | ![]() | Removed | syndlogo8 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo8.png) | ![]() | Removed | syndlogo9 | ![](https://raw.githubusercontent.com/Vault-Overseers/nuclear-14/1183e527e68e996cefc383eb399b98dfad1925b6/Resources/Textures/Decals/syndlogo.rsi/syndlogo9.png) | ![]() | Removed

Resources/Textures/Decals/fullcolor.rsi

| State | Old | New | Status | --- | --- | --- | --- | | full_tile | ![]() | ![](https://raw.githubusercontent.com/FizCap/nuclear-14/38ff86b57178985995185b5dc0002c91ad893b57/Resources/Textures/Decals/fullcolor.rsi/full_tile.png) | Added | half_tile | ![]() | ![](https://raw.githubusercontent.com/FizCap/nuclear-14/38ff86b57178985995185b5dc0002c91ad893b57/Resources/Textures/Decals/fullcolor.rsi/half_tile.png) | Added