Alternate atmos & sci jumpsuits + minor tie sprite changes (#14305)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
index 3cce3ffddb9456bb43ff17bedb8a55c181eaf844..c6ba7e76ada2f03c6994636af098e2c70ce02a36 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
@@ -6,6 +6,7 @@
     ClothingBackpackEngineering: 2
     ClothingUniformJumpsuitAtmos: 3
     ClothingUniformJumpskirtAtmos: 3
+    ClothingUniformJumpsuitAtmosCasual: 3
     ClothingShoesColorWhite: 3
     ClothingHeadsetEngineering: 2
     ClothingHeadHelmetFire: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
index b7bd7f4a98b515a034d057b5c4172a13a7673d1b..f53af3b8f050e9a13521620d8eb7c24088b6303d 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -6,8 +6,10 @@
     ClothingBackpackDuffelScience: 3
     ClothingUniformJumpsuitScientist: 3
     ClothingUniformJumpskirtScientist: 3
+    ClothingUniformJumpsuitScientistFormal: 3
     ClothingOuterCoatLab: 3
     ClothingShoesColorWhite: 3
+    ClothingNeckTieSci: 3
     ClothingHeadsetScience: 3
     ClothingMaskGas: 3
     ClothingOuterWinterSci: 2

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
index b1b879c7d4001c9c8a05e493de898d8564650732..c50ffa70927128df6bac70f2a069080def143963 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -19,3 +19,14 @@
     sprite: Clothing/Neck/Ties/dettie.rsi
   - type: Clothing
     sprite: Clothing/Neck/Ties/dettie.rsi
+    
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckTieSci
+  name: scientist's tie
+  description: Why do we all have to wear these ridiculous ties?
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Ties/scitie.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Ties/scitie.rsi

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index c95014a91be8ccb52ff89fde834c3b17aa707c48..66c2cfae5b45e2e84649bf3ffc9f331a824c80c7 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -401,6 +401,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitScientistFormal
+  name: scientist's formal jumpsuit
+  description: A uniform for sophisticated scientists, best worn with its matching tie.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitSec
@@ -810,6 +821,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitAtmosCasual
+  name: atmospheric technician's casual jumpsuit
+  description: Might as well relax with a job as easy as yours.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitPsychologist

diff --git a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/equipped-NECK.png
index 34c7ddb0bc2b290f3152f96997b8220c264fc543..5d3483f241896c8ea7e5428cf733dd70d30de8d8 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
index 1f012b2bebb3f7f15157098f990e911baac4b44b..87a73dd7654c8f2896c1d58eb6d2919f541fed96 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK.png
index 45a4c147fcc0d5146e68c46f93a3e57640f28331..d934f0f3272b63054c9d1dfca406042a95995e93 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
index 1f012b2bebb3f7f15157098f990e911baac4b44b..87a73dd7654c8f2896c1d58eb6d2919f541fed96 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/equipped-NECK.png
new file mode 100644 (file)
index 0000000..2e1e4aa
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/icon.png b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/icon.png
new file mode 100644 (file)
index 0000000..221a532
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json
new file mode 100644 (file)
index 0000000..87a73dd
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

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

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

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

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

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
new file mode 100644 (file)
index 0000000..1e516ab
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Edited from the atmos jumpsuit and grey jumpsuit by Flareguy for Space Station 14",
+  "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/scientist_formal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..4e7a06d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING.png differ

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

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

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

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json
new file mode 100644 (file)
index 0000000..89a7cdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Edited from the scientist jumpsuit by Flareguy for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}