Roboticist wardrobe (#16136)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
index cbe567f68a086b7a6e7d237c4fa3e6e82562eb7b..24d77584d92e7c4c3755032e2ea013bc6f2a83a7 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -20,10 +20,22 @@
 #  parent: WardrobeWhite
 #  name: pajama wardrobe
 
-# - type: entity
-#   id: WardrobeRoboticsFilled
-#   suffix: Filled
-#   parent: WardrobeRobotics
+ - type: entity
+   id: WardrobeRoboticsFilled
+   suffix: Filled
+   parent: WardrobeRobotics
+   description: "You can build a robot out of this locker."
+   components:
+   - type: StorageFill
+     contents:
+     - id: ClothingOuterCoatRobo
+       amount: 2
+     - id: ClothingUniformJumpsuitRoboticist
+     - id: ClothingUniformJumpskirtRoboticist
+     - id: ClothingShoesColorBlack
+       amount: 2
+     - id: ClothingHandsGlovesFingerless
+       amount: 2
 
  - type: entity
    id: WardrobeChemistryFilled

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
index b55a0b0814a3e548dffa5b465fd4f2bc5c6260d9..711b7cd8793ee9df4785c7b940c57bba7b1aa0a0 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
@@ -1,7 +1,9 @@
 - type: vendingMachineInventory
   id: RoboDrobeInventory
   startingInventory:
-    ClothingOuterCoatRnd: 2
+    ClothingOuterCoatRobo: 2
+    ClothingUniformJumpsuitRoboticist: 2
+    ClothingUniformJumpskirtRoboticist: 2
     ClothingShoesColorBlack: 2
     ClothingHandsGlovesFingerless: 2
     ClothingHeadHatCorpsoft: 2

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 9da2bd29acea9626d88300a3c9e314c787464cd7..bdf0b5dc1a436622a6b3cd80c5a5b151167c02dd 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -173,6 +173,21 @@
       coefficients:
         Caustic: 0.75
 
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatRobo
+  name: roboticist lab coat
+  description: More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/labcoat_robo.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/labcoat_robo.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.75
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatPirate

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index ea613e09303ac7912f0975c7fac86bc6d8657c0e..21e79f0db58e831c44603f53956513c8c30639e2 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -172,7 +172,7 @@
     modifiers:
       coefficients:
         Slash: 0.9
-        Piercing: 0.9  
+        Piercing: 0.9
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -188,7 +188,7 @@
     modifiers:
       coefficients:
         Slash: 0.9
-        Piercing: 0.9  
+        Piercing: 0.9
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -321,6 +321,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtRoboticist
+  name: roboticist jumpskirt
+  description: It's a slimming black with reinforced seams; great for industrial work.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/roboticist.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/roboticist.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtSec

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 862b9bc149f831a6c50f702ee279924e6fd49807..045efeebaad9c55bd1d62c6cb77ca7fb675fd45a 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -457,6 +457,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitRoboticist
+  name: roboticist jumpsuit
+  description: It's a slimming black with reinforced seams; great for industrial work.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitSec

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..7bddbe3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png
new file mode 100644 (file)
index 0000000..ec6f76e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png
new file mode 100644 (file)
index 0000000..6e5d353
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..3a0f37a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..9392a40
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
new file mode 100644 (file)
index 0000000..415d267
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-open"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..d2b53c5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png
new file mode 100644 (file)
index 0000000..8f0c134
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png
new file mode 100644 (file)
index 0000000..3c7f5e1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..2278c79
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png
new file mode 100644 (file)
index 0000000..a7f8213
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..0dceab6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..c512a19
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json
new file mode 100644 (file)
index 0000000..00ee882
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5da269bf8615c7d645ab85556a0a658c20baa74",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+        "name": "icon"
+    },
+    {
+        "name": "equipped-INNERCLOTHING",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right",
+        "directions": 4
+    }
+  ]
+}
\ No newline at end of file

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..963a2f9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png
new file mode 100644 (file)
index 0000000..fcab14d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..0dceab6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..c512a19
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
new file mode 100644 (file)
index 0000000..00ee882
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5da269bf8615c7d645ab85556a0a658c20baa74",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+        "name": "icon"
+    },
+    {
+        "name": "equipped-INNERCLOTHING",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right",
+        "directions": 4
+    }
+  ]
+}
\ No newline at end of file