Merge remote-tracking branch 'upstream/master' into ups

Resources/Textures/Objects/Magic/magicactions.rsi/meta.json

@@ -60,6 +60,9 @@
       },
       {
           "name": "mindswap"
+      },
+      {
+          "name": "time"
       }
   ]
 }

Resources/Textures/White/Effects/timestop.rsi/meta.json

@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license":  "CC-BY-SA-3.0",
+  "copyright":  "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448",
+  "size": {
+    "x": 160,
+    "y": 160
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json

@@ -22,11 +22,17 @@
     {
       "name": "accelerator"
     },
+    {
+      "name": "eightaim"
+    },
     {
       "name": "barrel_module"
     },
     {
       "name": "handguard_module"
+    },
+    {
+      "name": "aim_module"
     }
   ]
 }

Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json

@@ -22,11 +22,17 @@
         {
             "name": "accelerator"
         },
+        {
+            "name": "eightaim"
+        },
         {
             "name": "handguard_module"
         },
         {
             "name": "barrel_module"
+        },
+        {
+            "name": "aim_module"
         }
     ]
 }

Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json

@@ -22,11 +22,17 @@
         {
             "name": "accelerator"
         },
+        {
+            "name": "eightaim"
+        },
         {
             "name": "handguard_module"
         },
         {
             "name": "barrel_module"
+        },
+        {
+            "name": "aim_module"
         }
     ]
 }