some robotics inhands (#33676)

* real

* spacing stuff and fix tiny issue

diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 3b0f2540963ded1e8227e2e077446f37830dc11b..9e6d8268c709d8d555c3c4be1b0c57db98735f7e 100644 (file)
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -44,6 +44,8 @@
     - Trash
     - BorgArm
     - BorgLArm
+  - type: Item
+    heldPrefix: borg-arm
 
 - type: entity
   id: RightArmBorg
@@ -62,6 +64,8 @@
     - Trash
     - BorgArm
     - BorgRArm
+  - type: Item
+    heldPrefix: borg-arm
 
 - type: entity
   id: LeftLegBorg
@@ -80,6 +84,8 @@
     - Trash
     - BorgLeg
     - BorgLLeg
+  - type: Item
+    heldPrefix: borg-leg
 
 - type: entity
   id: RightLegBorg
@@ -98,6 +104,8 @@
     - Trash
     - BorgLeg
     - BorgRLeg
+  - type: Item
+    heldPrefix: borg-leg
 
 - type: entity
   id: LightHeadBorg
@@ -114,6 +122,8 @@
     tags:
     - Trash
     - BorgHead
+  - type: Item
+    heldPrefix: borg-head
 
 - type: entity
   id: TorsoBorg
@@ -130,3 +140,5 @@
     tags:
     - Trash
     - BorgTorso
+  - type: Item
+    heldPrefix: borg-chest

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index ff8e98339956861333edf04f04e4fb8b1ca3582b..44855ccfa3bef06929cad7be62bcff436fadf536 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -7,6 +7,23 @@
   components:
   - type: Item
     storedRotation: -90
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#8FCBCB"
+      - state: base-module-inhand-left
+        color: "#A1A1A1"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7D7D7D"
+      right:
+      - state: base-icon-inhand-right
+        color: "#8FCBCB"
+      - state: base-module-inhand-right
+        color: "#A1A1A1"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7D7D7D"
   - type: Sprite
     sprite: Objects/Specific/Robotics/borgmodule.rsi
   - type: BorgModule
@@ -49,6 +66,22 @@
   - type: Tag
     tags:
     - BorgModuleCargo
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#EBD8B7"
+      - state: base-module-inhand-left
+        color: "#613D1D"
+      - state: base-stripes-inhand-left
+        color: "#593718"
+      right:
+      - state: base-icon-inhand-right
+        color: "#EBD8B7"
+      - state: base-module-inhand-right
+        color: "#613D1D"
+      - state: base-stripes-inhand-right
+        color: "#593718"
 
 - type: entity
   id: BaseBorgModuleEngineering
@@ -58,6 +91,24 @@
   - type: Tag
     tags:
     - BorgModuleEngineering
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#8FCBCB"
+      - state: base-module-inhand-left
+        color: "#BA3939"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#DEC343"
+      right:
+      - state: base-icon-inhand-right
+        color: "#8FCBCB"
+      - state: base-module-inhand-right
+        color: "#BA3939"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#DEC343"
 
 - type: entity
   id: BaseBorgModuleJanitor
@@ -67,6 +118,24 @@
   - type: Tag
     tags:
     - BorgModuleJanitor
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#CFA2E4"
+      - state: base-module-inhand-left
+        color: "#753186"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#404040"
+      right:
+      - state: base-icon-inhand-right
+        color: "#CFA2E4"
+      - state: base-module-inhand-right
+        color: "#753186"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#404040"
 
 - type: entity
   id: BaseBorgModuleMedical
@@ -76,6 +145,51 @@
   - type: Tag
     tags:
     - BorgModuleMedical
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#EEF5F5"
+      - state: base-module-inhand-left
+        color: "#5A96BB"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#EEF5F5"
+      - state: base-module-inhand-right
+        color: "#5A96BB"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#C3C3C3"
+
+- type: entity
+  id: BaseBorgModuleScience
+  parent: BaseBorgModule
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - BorgModuleScience
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FFAEB6"
+      - state: base-module-inhand-left
+        color: "#9C0DE1"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FFAEB6"
+      - state: base-module-inhand-right
+        color: "#9C0DE1"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#C3C3C3"
 
 - type: entity
   id: BaseBorgModuleService
@@ -85,24 +199,79 @@
   - type: Tag
     tags:
     - BorgModuleService
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#F3F3F3"
+      - state: base-module-inhand-left
+        color: "#3A3A3A"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#313131"
+      right:
+      - state: base-icon-inhand-right
+        color: "#F3F3F3"
+      - state: base-module-inhand-right
+        color: "#3A3A3A"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#313131"
 
 - type: entity
   id: BaseBorgModuleSyndicate
   parent: BaseBorgModule
   abstract: true
   components:
-    - type: Tag
-      tags:
-        - BorgModuleSyndicate
+  - type: Tag
+    tags:
+    - BorgModuleSyndicate
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"
+      
 
 - type: entity
   id: BaseBorgModuleSyndicateAssault
   parent: BaseBorgModule
   abstract: true
   components:
-    - type: Tag
-      tags:
-        - BorgModuleSyndicateAssault
+  - type: Tag
+    tags:
+    - BorgModuleSyndicateAssault
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"
 
 # generic modules
 - type: entity
@@ -427,7 +596,7 @@
 # todo: if science ever gets their own custom robot, add more "sci" modules.
 - type: entity
   id: BorgModuleArtifact
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
   name: artifact cyborg module
   components:
   - type: Sprite
@@ -442,7 +611,7 @@
 
 - type: entity
   id: BorgModuleAnomaly
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
   name: anomaly cyborg module
   components:
   - type: Sprite
@@ -565,6 +734,24 @@
     - EnergyDaggerLoud
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module }
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"
 
 - type: entity
   id: BorgModuleOperative
@@ -634,3 +821,21 @@
         - SelfDestructSeq
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
+    - type: Item
+      inhandVisuals:
+        left:
+        - state: base-icon-inhand-left
+          color: "#FF0000"
+        - state: base-module-inhand-left
+          color: "#891417"
+        - state: base-part-inhand-left
+        - state: base-stripes-inhand-left
+          color: "#7B0F12"
+        right:
+        - state: base-icon-inhand-right
+          color: "#FF0000"
+        - state: base-module-inhand-right
+          color: "#891417"
+        - state: base-part-inhand-right
+        - state: base-stripes-inhand-right
+          color: "#7B0F12"

diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index f6294be68e35e33d808579516af237b0ccbb6e34..d78cf505dc46dc097ca3bf8a665ccf3b144e8d50 100644 (file)
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -1,4 +1,4 @@
-# Generic borg
+# Generic borg
 - type: borgType
   id: generic
 
@@ -10,6 +10,7 @@
   moduleWhitelist:
     tags:
     - BorgModuleGeneric
+    - BorgModuleScience #until sciborgs are added
 
   defaultModules:
   - BorgModuleTool

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index e3dcb9b11b04f7612ca139c0e298611ab6c052be..5d7d19950d1e4764ea45f4ae6d8c55716e86534f 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -117,6 +117,9 @@
 - type: Tag
   id: BorgModuleMedical
 
+- type: Tag
+  id: BorgModuleScience
+
 - type: Tag
   id: BorgModuleService
 

diff --git a/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a1f411c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..eee6c34
Binary files /dev/null and b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Misc/proximity_sensor.rsi/meta.json b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/meta.json
index 3fb15166fcae2c8a1f80142974ddb9f935a4242d..3c842198c651172531e72f9e5c50cca5e1fc7550 100644 (file)
--- a/Resources/Textures/Objects/Misc/proximity_sensor.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/meta.json
@@ -1,15 +1,23 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
-   "license" : "CC-BY-SA-3.0",
-   "size" : {
-      "x" : 32,
-      "y" : 32
-   },
-   "states" : [
-      {
-         "directions" : 1,
-         "name" : "icon"
-      }
-   ],
-   "version" : 1
+    "version": 1,
+    "copyright": "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. inhands by mubururu_",
+    "license": "CC-BY-SA-3.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "directions": 1,
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-left.png
new file mode 100644 (file)
index 0000000..6309b14
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-right.png
new file mode 100644 (file)
index 0000000..20f2e12
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-left.png
new file mode 100644 (file)
index 0000000..df1fabb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-right.png
new file mode 100644 (file)
index 0000000..193adb4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-left.png
new file mode 100644 (file)
index 0000000..0042f7d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-right.png
new file mode 100644 (file)
index 0000000..5331394
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-left.png
new file mode 100644 (file)
index 0000000..e1491c0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-right.png
new file mode 100644 (file)
index 0000000..4cd9091
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 74c9893cae3735564db53e049b07c1d991cb97a0..cb48ef147b4c3b703edd620e843e69f0263197d9 100644 (file)
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,131 +1,163 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "cargo"
-    },
-    {
-      "name": "engineering"
-    },
-    {
-      "name": "generic"
-    },
-    {
-      "name": "icon-anomalies"
-    },
-    {
-      "name": "icon-appraisal"
-    },
-    {
-      "name": "icon-artifacts"
-    },
-    {
-      "name": "icon-cables"
-    },
-    {
-      "name": "icon-chemist"
-    },
-    {
-      "name": "icon-clown"
-    },
-    {
-      "name": "icon-construction"
-    },
-    {
-      "name": "icon-defib"
-    },
-    {
-      "name": "icon-diagnosis"
-    },
-    {
-      "name": "icon-fire-extinguisher"
-    },
-    {
-      "name": "icon-gardening"
-    },
-    {
-      "name": "icon-gas-analyzer"
-    },
-    {
-      "name": "icon-gps"
-    },
-    {
-      "name": "icon-grappling-gun"
-    },
-    {
-      "name": "icon-harvesting"
-    },
-    {
-      "name": "icon-light-replacer"
-    },
-    {
-      "name": "icon-mining"
-    },
-    {
-      "name": "icon-mop"
-    },
-    {
-      "name": "icon-mop-adv"
-    },
-    {
-      "name": "icon-musique"
-    },
-    {
-      "name": "icon-pen"
-    },
-    {
-      "name": "icon-radiation"
-    },
-    {
-      "name": "icon-rcd"
-    },
-    {
-      "name": "icon-template"
-    },
-    {
-      "name": "icon-tools-adv"
-    },
-    {
-      "name": "icon-tools"
-    },
-    {
-      "name": "icon-trash-bag"
-    },
-    {
-      "name": "icon-treatment"
-    },
-    {
-      "name": "icon-syndicate"
-    },
-    {
-      "name": "janitor"
-    },
-    {
-      "name": "icon-bomb"
-    },
-    {
-      "name": "medical"
-    },
-    {
-      "name": "science"
-    },
-    {
-      "name": "security"
-    },
-    {
-      "name": "service"
-    },
-    {
-      "name": "syndicateborgbomb"
-    },
-    {
-      "name": "syndicate"
-    }
-  ]
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). layered inhands by mubururu_ (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "cargo"
+        },
+        {
+            "name": "engineering"
+        },
+        {
+            "name": "generic"
+        },
+        {
+            "name": "icon-anomalies"
+        },
+        {
+            "name": "icon-appraisal"
+        },
+        {
+            "name": "icon-artifacts"
+        },
+        {
+            "name": "icon-cables"
+        },
+        {
+            "name": "icon-chemist"
+        },
+        {
+            "name": "icon-clown"
+        },
+        {
+            "name": "icon-construction"
+        },
+        {
+            "name": "icon-defib"
+        },
+        {
+            "name": "icon-diagnosis"
+        },
+        {
+            "name": "icon-fire-extinguisher"
+        },
+        {
+            "name": "icon-gardening"
+        },
+        {
+            "name": "icon-gas-analyzer"
+        },
+        {
+            "name": "icon-gps"
+        },
+        {
+            "name": "icon-grappling-gun"
+        },
+        {
+            "name": "icon-harvesting"
+        },
+        {
+            "name": "icon-light-replacer"
+        },
+        {
+            "name": "icon-mining"
+        },
+        {
+            "name": "icon-mop"
+        },
+        {
+            "name": "icon-mop-adv"
+        },
+        {
+            "name": "icon-musique"
+        },
+        {
+            "name": "icon-pen"
+        },
+        {
+            "name": "icon-radiation"
+        },
+        {
+            "name": "icon-rcd"
+        },
+        {
+            "name": "icon-template"
+        },
+        {
+            "name": "icon-tools-adv"
+        },
+        {
+            "name": "icon-tools"
+        },
+        {
+            "name": "icon-trash-bag"
+        },
+        {
+            "name": "icon-treatment"
+        },
+        {
+            "name": "icon-syndicate"
+        },
+        {
+            "name": "janitor"
+        },
+        {
+            "name": "icon-bomb"
+        },
+        {
+            "name": "medical"
+        },
+        {
+            "name": "science"
+        },
+        {
+            "name": "security"
+        },
+        {
+            "name": "service"
+        },
+        {
+            "name": "syndicateborgbomb"
+        },
+        {
+            "name": "syndicate"
+        },
+        {
+            "name": "base-icon-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-icon-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "base-module-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-module-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "base-part-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-part-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "base-stripes-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-stripes-inhand-right",
+            "directions": 4
+        }
+    ]
 }

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-left.png
new file mode 100644 (file)
index 0000000..2d844e8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-right.png
new file mode 100644 (file)
index 0000000..8e1c8ca
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-left.png
new file mode 100644 (file)
index 0000000..8385860
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-right.png
new file mode 100644 (file)
index 0000000..533be96
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-left.png
new file mode 100644 (file)
index 0000000..af789b8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-right.png
new file mode 100644 (file)
index 0000000..3a25741
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-left.png
new file mode 100644 (file)
index 0000000..fc7a273
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-right.png
new file mode 100644 (file)
index 0000000..3d9ab79
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
index 8cab41943fe2f55e41afc84bc5aed3846cdc9bf6..76a5858172dc425d854627b672f3e4f86a3ffced 100644 (file)
--- a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
@@ -1,218 +1,250 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "borg_l_arm"
-    },
-    {
-      "name": "borg_r_arm"
-    },
-    {
-      "name": "borg_l_leg"
-    },
-    {
-      "name": "borg_r_leg"
-    },
-    {
-      "name": "borg_chest"
-    },
-    {
-      "name": "borg_head"
-    },
-    {
-      "name": "robo_suit"
-    },
-    {
-      "name": "borg_head+o"
-    },
-    {
-      "name": "borg_chest+o"
-    },
-    {
-      "name": "borg_l_arm+o"
-    },
-    {
-      "name": "borg_r_arm+o"
-    },
-    {
-      "name": "borg_l_leg+o"
-    },
-    {
-      "name": "borg_r_leg+o"
-    },
-    {
-      "name": "janitor_l_leg"
-    },
-    {
-      "name": "janitor_r_leg"
-    },
-    {
-      "name": "janitor_chest"
-    },
-    {
-      "name": "janitor_head"
-    },
-    {
-      "name": "janitor_head+o"
-    },
-    {
-      "name": "janitor_chest+o"
-    },
-    {
-      "name": "janitor_l_leg+o"
-    },
-    {
-      "name": "janitor_r_leg+o"
-    },
-    {
-      "name": "engineer_l_arm"
-    },
-    {
-      "name": "engineer_r_arm"
-    },
-    {
-      "name": "engineer_l_leg"
-    },
-    {
-      "name": "engineer_r_leg"
-    },
-    {
-      "name": "engineer_chest"
-    },
-    {
-      "name": "engineer_head"
-    },
-    {
-      "name": "engineer_head+o"
-    },
-    {
-      "name": "engineer_chest+o"
-    },
-    {
-      "name": "engineer_l_arm+o"
-    },
-    {
-      "name": "engineer_r_arm+o"
-    },
-    {
-      "name": "engineer_l_leg+o"
-    },
-    {
-      "name": "engineer_r_leg+o"
-    },
-    {
-      "name": "medical_l_arm"
-    },
-    {
-      "name": "medical_r_arm"
-    },
-    {
-      "name": "medical_l_leg"
-    },
-    {
-      "name": "medical_r_leg"
-    },
-    {
-      "name": "medical_chest"
-    },
-    {
-      "name": "medical_head"
-    },
-    {
-      "name": "medical_head+o"
-    },
-    {
-      "name": "medical_chest+o"
-    },
-    {
-      "name": "medical_l_arm+o"
-    },
-    {
-      "name": "medical_r_arm+o"
-    },
-    {
-      "name": "medical_l_leg+o"
-    },
-    {
-      "name": "medical_r_leg+o"
-    },
-    {
-      "name": "mining_l_arm"
-    },
-    {
-      "name": "mining_r_arm"
-    },
-    {
-      "name": "mining_l_leg"
-    },
-    {
-      "name": "mining_r_leg"
-    },
-    {
-      "name": "mining_chest"
-    },
-    {
-      "name": "mining_head"
-    },
-    {
-      "name": "mining_head+o"
-    },
-    {
-      "name": "mining_chest+o"
-    },
-    {
-      "name": "mining_l_arm+o"
-    },
-    {
-      "name": "mining_r_arm+o"
-    },
-    {
-      "name": "mining_l_leg+o"
-    },
-    {
-      "name": "mining_r_leg+o"
-    },
-    {
-      "name": "service_l_arm"
-    },
-    {
-      "name": "service_r_arm"
-    },
-    {
-      "name": "service_l_leg"
-    },
-    {
-      "name": "service_r_leg"
-    },
-    {
-      "name": "service_chest"
-    },
-    {
-      "name": "service_head"
-    },
-    {
-      "name": "service_head+o"
-    },
-    {
-      "name": "service_chest+o"
-    },
-    {
-      "name": "service_l_arm+o"
-    },
-    {
-      "name": "service_r_arm+o"
-    },
-    {
-      "name": "service_l_leg+o"
-    },
-    {
-      "name": "service_r_leg+o"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, limb sprites edited into inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "borg_l_arm"
+        },
+        {
+            "name": "borg_r_arm"
+        },
+        {
+            "name": "borg-arm-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "borg-arm-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "borg_l_leg"
+        },
+        {
+            "name": "borg_r_leg"
+        },
+        {
+            "name": "borg-leg-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "borg-leg-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "borg_chest"
+        },
+        {
+            "name": "borg-chest-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "borg-chest-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "borg_head"
+        },
+        {
+            "name": "borg-head-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "borg-head-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "robo_suit"
+        },
+        {
+            "name": "borg_head+o"
+        },
+        {
+            "name": "borg_chest+o"
+        },
+        {
+            "name": "borg_l_arm+o"
+        },
+        {
+            "name": "borg_r_arm+o"
+        },
+        {
+            "name": "borg_l_leg+o"
+        },
+        {
+            "name": "borg_r_leg+o"
+        },
+        {
+            "name": "janitor_l_leg"
+        },
+        {
+            "name": "janitor_r_leg"
+        },
+        {
+            "name": "janitor_chest"
+        },
+        {
+            "name": "janitor_head"
+        },
+        {
+            "name": "janitor_head+o"
+        },
+        {
+            "name": "janitor_chest+o"
+        },
+        {
+            "name": "janitor_l_leg+o"
+        },
+        {
+            "name": "janitor_r_leg+o"
+        },
+        {
+            "name": "engineer_l_arm"
+        },
+        {
+            "name": "engineer_r_arm"
+        },
+        {
+            "name": "engineer_l_leg"
+        },
+        {
+            "name": "engineer_r_leg"
+        },
+        {
+            "name": "engineer_chest"
+        },
+        {
+            "name": "engineer_head"
+        },
+        {
+            "name": "engineer_head+o"
+        },
+        {
+            "name": "engineer_chest+o"
+        },
+        {
+            "name": "engineer_l_arm+o"
+        },
+        {
+            "name": "engineer_r_arm+o"
+        },
+        {
+            "name": "engineer_l_leg+o"
+        },
+        {
+            "name": "engineer_r_leg+o"
+        },
+        {
+            "name": "medical_l_arm"
+        },
+        {
+            "name": "medical_r_arm"
+        },
+        {
+            "name": "medical_l_leg"
+        },
+        {
+            "name": "medical_r_leg"
+        },
+        {
+            "name": "medical_chest"
+        },
+        {
+            "name": "medical_head"
+        },
+        {
+            "name": "medical_head+o"
+        },
+        {
+            "name": "medical_chest+o"
+        },
+        {
+            "name": "medical_l_arm+o"
+        },
+        {
+            "name": "medical_r_arm+o"
+        },
+        {
+            "name": "medical_l_leg+o"
+        },
+        {
+            "name": "medical_r_leg+o"
+        },
+        {
+            "name": "mining_l_arm"
+        },
+        {
+            "name": "mining_r_arm"
+        },
+        {
+            "name": "mining_l_leg"
+        },
+        {
+            "name": "mining_r_leg"
+        },
+        {
+            "name": "mining_chest"
+        },
+        {
+            "name": "mining_head"
+        },
+        {
+            "name": "mining_head+o"
+        },
+        {
+            "name": "mining_chest+o"
+        },
+        {
+            "name": "mining_l_arm+o"
+        },
+        {
+            "name": "mining_r_arm+o"
+        },
+        {
+            "name": "mining_l_leg+o"
+        },
+        {
+            "name": "mining_r_leg+o"
+        },
+        {
+            "name": "service_l_arm"
+        },
+        {
+            "name": "service_r_arm"
+        },
+        {
+            "name": "service_l_leg"
+        },
+        {
+            "name": "service_r_leg"
+        },
+        {
+            "name": "service_chest"
+        },
+        {
+            "name": "service_head"
+        },
+        {
+            "name": "service_head+o"
+        },
+        {
+            "name": "service_chest+o"
+        },
+        {
+            "name": "service_l_arm+o"
+        },
+        {
+            "name": "service_r_arm+o"
+        },
+        {
+            "name": "service_l_leg+o"
+        },
+        {
+            "name": "service_r_leg+o"
+        }
+    ]
 }