(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -271,7 +271,7 @@ namespace Barotrauma.Items.Components
                        }
                    }
                }
-            }            
+            }

            if (highlighted != null)
            {