Merge pull request #3718 from SweptWasTaken/swepthud

Content.Client/UserInterface/HandsGui.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.GameObjects.Components.Items;

Resources/Textures/Interface/Inventory/glasses.svg

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 8.4666665 8.4666669"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="glasses.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="14.828137"
-     inkscape:cy="15.19488"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1043"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     units="px" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-288.53332)">
-    <image
-       sodipodi:absref="/home/pj/Projects/space-station-14-content/glasses.png"
-       y="108.08342"
-       x="43.207016"
-       id="image840"
-       xlink:href="file:///home/pj/Projects/space-station-14-content/glasses.png"
-       style="display:none;image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="8.4666662"
-       width="8.4666662" />
-    <circle
-       style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path815"
-       cx="2.3086014"
-       cy="292.76666"
-       r="0.76626426" />
-    <circle
-       style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path815-6"
-       cx="4.3026695"
-       cy="292.76666"
-       r="0.76626426" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.085868,292.75555 H 3.522904"
-       id="path868"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 5.061384,292.75555 1.003999,-3e-5 c 0.356045,-10e-6 0.488604,0.16387 0.897694,0.57296"
-       id="path870"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 4.988586,292.75556 0.185486,-3e-5 c 0.356045,-6e-5 0.488604,0.16387 0.897694,0.57296"
-       id="path870-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
-  </g>
-</svg>

Resources/Textures/Interface/Inventory/gloves.svg

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 8.4666659 8.466667"
-   version="1.1"
-   id="svg912"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="gloves.svg"
-   inkscape:export-filename="/home/pj/Projects/space-station-14-content/Resources/Textures/Interface/Inventory/gloves.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs906" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="17.536337"
-     inkscape:cy="14.275659"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1043"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata909">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-288.5333)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1.9525478,291.26443 c 0,0.23594 0.1994344,0.34762 0.2856665,0.66944 0,0.31856 0.015047,0.90263 0.015047,1.22345 0,0.40616 0.6592986,0.30993 0.6592986,-0.004 0,-0.38058 0.057472,-0.94729 0.057472,-0.94729 0,0 0.7583988,0.72486 1.0781105,1.04457 0.2855073,0.28551 0.8124286,-0.0134 0.4799193,-0.40438 l -0.6927446,-0.78051 c 0.360831,0.33733 0.5807924,0.59974 0.7890681,0.78603 0.4097094,0.36646 0.6914628,-0.10836 0.4662146,-0.34144 -0.1593714,-0.16492 -0.598016,-0.55927 -0.9058744,-0.80912 0.3908642,0.30678 0.4738078,0.3948 0.8035667,0.66665 0.3297588,0.27184 0.7235678,-0.20201 0.4084646,-0.4378 -0.3151033,-0.2358 -1.5446309,-1.18021 -2.2513292,-1.68258 -0.4278456,-0.30405 -1.1918729,0.48841 -1.1928801,1.01719 z"
-       id="path1487"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccssczzcsc" />
-  </g>
-</svg>

Resources/Textures/Interface/Inventory/ike-ui/meta

@@ -0,0 +1,68 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Heavily derived from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac.",
+    "states": [
+        {
+            "name": "back",
+        },
+        {
+            "name": "belt"
+        },
+        {
+            "name": "block"
+        },
+        {
+            "name": "ears"
+        },
+        {
+            "name": "glasses"
+        },
+        {
+            "name": "gloves"
+        },
+        {
+            "name": "hand_l"
+        },
+        {
+            "name": "hand_l_active"
+        },
+        {
+            "name": "hand_r"
+        },
+        {
+            "name": "hand_r_active"
+        },
+        {
+            "name": "head"
+        },
+        {
+            "name": "id"
+        },
+        {
+            "name": "invtoggle"
+        },
+        {
+            "name": "mask"
+        },
+		{
+            "name": "neck"
+        },
+        {
+            "name": "pocket"
+        },
+        {
+            "name": "shoes"
+        },
+        {
+            "name": "suit"
+        },
+        {
+            "name": "uniform"
+        }
+    ]
+}

Resources/Textures/Interface/Inventory/meta.json

@@ -1,68 +1,86 @@
 {
-    "version": 1,
+  "version": 1,
-    "size": {
+  "size": {
-        "x": 32,
+      "x": 32,
-        "y": 32
+      "y": 32
-    },
+  },
-    "license": "CC-BY-NC-SA-3.0",
+  "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Heavily derived from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac.",
+  "copyright": "Taken from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac.",
-    "states": [
+  "states": [
-        {
+      {
-            "name": "back",
+        "name": "back",
-        },
+      },
-        {
+      {
-            "name": "belt"
+        "name": "belt"
-        },
+      },
-        {
+      {
-            "name": "block"
+        "name": "block"
-        },
+      },
-        {
+      {
-            "name": "ears"
+        "name": "ears"
-        },
+      },
-        {
+      {
-            "name": "glasses"
+        "name": "ears_headset"
-        },
+      },
-        {
+      {
-            "name": "gloves"
+        "name": "glasses"
-        },
+      },
-        {
+      {
-            "name": "hand_l"
+        "name": "gloves"
-        },
+      },
-        {
+      {
-            "name": "hand_l_active"
+        "name": "hand_active"
-        },
+      },
-        {
+      {
-            "name": "hand_r"
+        "name": "hand_active_gold"
-        },
+      },
-        {
+      {
-            "name": "hand_r_active"
+        "name": "hand_l"
-        },
+      },
-        {
+      {
-            "name": "head"
+        "name": "hand_l_no_letter"
-        },
+      },
-        {
+      {
-            "name": "id"
+        "name": "hand_r"
-        },
+      },
-        {
+      {
-            "name": "invtoggle"
+        "name": "hand_r_no_letter"
-        },
+      },
-        {
+      {
-            "name": "mask"
+        "name": "head"
-        },
+      },
-		{
+      {
-            "name": "neck"
+        "name": "id"
-        },
+      },
-        {
+      {
-            "name": "pocket"
+        "name": "invtoggle"
-        },
+      },
-        {
+      {
-            "name": "shoes"
+        "name": "mask"
-        },
+      },
-        {
+	    {
-            "name": "suit"
+        "name": "neck"
-        },
+      },
-        {
+      {
-            "name": "uniform"
+        "name": "pocket"
-        }
+      },
-    ]
+      {
+        "name": "shoes"
+      },
+      {
+        "name": "suit"
+      },
+      {
+        "name": "suit_storage"
+      },
+      {
+        "name": "uniform"
+      },
+      {
+        "name": "inventory"
+      },
+      {
+        "name": "pda"
+      }
+   ]
 }