Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

Merged master into branch

Resources/Textures/Objects/Devices/ai_card.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -12,11 +12,47 @@
     },
     {
       "name": "inhand-left",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ]
+      ]
     },
     {
       "name": "inhand-right",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ],
+        [
+          0.4,
+          0.4
+        ]
+      ]
     },
     {
       "name": "empty",
@@ -55,4 +91,4 @@
       ]
     }
   ]
-}
+}

Resources/Textures/Objects/Devices/chameleon_projector.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at ",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/71a1fee2f13730adee5302d34bfa0f0262314d63,  Inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Objects/Devices/forensic_scanner.rsi/meta.json

@@ -1,21 +1,33 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation",
+   "version": 1,
    "license" : "CC-BY-SA-3.0",
+   "copyright" : "Icon modified from VG Station https://github.com/vgstation-coders/vgstation13/commit/4fc020f93702a45a66ebf01aed66864355393550, inhands/belt by TiniestShark (Github)",
    "size" : {
       "x" : 32,
       "y" : 32
    },
-   "states" : [
-      {
-         "delays" : [
-            [
-               0.8,
-               0.2
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
             ]
-         ],
-         "directions" : 1,
-         "name" : "forensicnew"
-      }
-   ],
-   "version" : 1
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Objects/Devices/hand_teleporter.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at 43d3fb991641d0dc73b6ce81cdf4f3f09d6b70a0",
+  "copyright": "tgstation at 43d3fb991641d0dc73b6ce81cdf4f3f09d6b70a0, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -20,11 +20,47 @@
     },
     {
       "name": "inhand-left",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ]
+       ]
     },
     {
       "name": "inhand-right",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Objects/Devices/igniter.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/9a401d19045574f3ea7f2cf3feebf65989903ccc/icons/obj/assemblies/new_assemblies.dmi",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/9a401d19045574f3ea7f2cf3feebf65989903ccc/icons/obj/assemblies/new_assemblies.dmi, inhands by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -9,6 +9,14 @@
   "states": [
     {
       "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "pinonalert",
@@ -157,11 +157,27 @@
             "name": "pinpointer-station"
         },
         {
-            "name": "inhand-left",
+            "name": "inhand-left-base",
             "directions": 4
         },
         {
-            "name": "inhand-right",
+            "name": "inhand-left-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-top",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-base",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-top",
             "directions": 4
         }
     ]

Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json

@@ -1,20 +1,65 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi, inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+
+    ]
 }