]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[Entity] Add scientist lab coat (#15455)
authormhamster <81412348+mhamsterr@users.noreply.github.com>
Wed, 19 Apr 2023 07:42:05 +0000 (14:42 +0700)
committerGitHub <noreply@github.com>
Wed, 19 Apr 2023 07:42:05 +0000 (01:42 -0600)
* Hey bro nice coat

+ added scientist lab coat
+ made scientist lab coat obtainable from scidrobe
+ made scientist lab coat obtainable from robodrobe
+ made scientist lab coat obtainable from role joining science departament
+ made scientist lab coat obtainable from science locker
+ made scientist lab coat obtainable from science wardrobe

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
16 files changed:
Resources/Prototypes/Catalog/Fills/Lockers/science.yml
Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
Resources/Prototypes/Roles/Jobs/Science/scientist.yml
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png [new file with mode: 0644]

index 6ad240384651433f948452d9aa993602f2a498be..881547fc10a8569e223cba07dfbabb3ca24560ed 100644 (file)
@@ -8,6 +8,6 @@
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetScience
       - id: ClothingMaskSterile
-      - id: ClothingOuterCoatLab
+      - id: ClothingOuterCoatRnd
       - id: AnomalyScanner
       - id: NodeScanner
index d50cace0cf5c1cf9e1d4e020a5a54da022a098ec..5c24c995186f6aa89ecf2f63044ee1fb3f2b5be4 100644 (file)
@@ -78,7 +78,7 @@
        - id: ClothingUniformJumpsuitScientist
        - id: ClothingBackpackScience
        - id: ClothingShoesColorWhite
-       - id: ClothingOuterCoatLab
+       - id: ClothingOuterCoatRnd
        - id: ClothingUniformJumpskirtScientist
        - id: ClothingEyesGlasses
          prob: 0.5
index 605b8f550d20d5ae0837f154b1e72a04ac90b9d2..b55a0b0814a3e548dffa5b465fd4f2bc5c6260d9 100644 (file)
@@ -1,7 +1,7 @@
 - type: vendingMachineInventory
   id: RoboDrobeInventory
   startingInventory:
-    ClothingOuterCoatLab: 2
+    ClothingOuterCoatRnd: 2
     ClothingShoesColorBlack: 2
     ClothingHandsGlovesFingerless: 2
     ClothingHeadHatCorpsoft: 2
index f53af3b8f050e9a13521620d8eb7c24088b6303d..83562b174bd96f681ceb949c5f3b46030b76df3d 100644 (file)
@@ -7,7 +7,7 @@
     ClothingUniformJumpsuitScientist: 3
     ClothingUniformJumpskirtScientist: 3
     ClothingUniformJumpsuitScientistFormal: 3
-    ClothingOuterCoatLab: 3
+    ClothingOuterCoatRnd: 3
     ClothingShoesColorWhite: 3
     ClothingNeckTieSci: 3
     ClothingHeadsetScience: 3
index 0429396d646eb8efe5e48f0dd2192754ea5ddfdf..7d5e62e1d73e09095b3e97ba57643213f5b7324b 100644 (file)
       coefficients:
         Caustic: 0.75
 
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatRnd
+  name: scientist lab coat
+  description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/rndcoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/rndcoat.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.75
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatPirate
     sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi
-    
\ No newline at end of file
index 25aa8b2037e16f4a8dc6cfd812c384ff11e412b1..d3e54f579c793f55b10f365f07cf52bc5b920dc5 100644 (file)
@@ -27,7 +27,7 @@
     jumpsuit: ClothingUniformJumpsuitResearchDirector
     back: ClothingBackpackResearchDirectorFilled
     shoes: ClothingShoesColorBrown
-    outerClothing: ClothingOuterCoatLab
+    outerClothing: ClothingOuterCoatRnd
     id: RnDPDA
     ears: ClothingHeadsetRD
   innerclothingskirt: ClothingUniformJumpskirtResearchDirector
index debec221a6f3f1ae1a595a4f2db84d6e009d7f58..a60a0da64b506431b39fee4d3df5a49a9a60eaa4 100644 (file)
@@ -20,7 +20,7 @@
     jumpsuit: ClothingUniformJumpsuitScientist
     back: ClothingBackpackScienceFilled
     shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatLab
+    outerClothing: ClothingOuterCoatRnd
     id: SciencePDA
     ears: ClothingHeadsetScience
   innerclothingskirt: ClothingUniformJumpskirtScientist
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..9f5f13f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png
new file mode 100644 (file)
index 0000000..89c2f1a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon-open.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png
new file mode 100644 (file)
index 0000000..bd519b3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..16b102c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..4bf1ce7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json
new file mode 100644 (file)
index 0000000..442bfb2
--- /dev/null
@@ -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
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..1f83265
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png
new file mode 100644 (file)
index 0000000..2676473
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png
new file mode 100644 (file)
index 0000000..5d99067
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png differ