From: mhamster <81412348+mhamsterr@users.noreply.github.com> Date: Wed, 19 Apr 2023 07:42:05 +0000 (+0700) Subject: [Entity] Add scientist lab coat (#15455) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6161f7d5f3309194a4074c5a46c12eb1d9530238;p=space-station-14.git [Entity] Add scientist lab coat (#15455) * 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> --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml index 6ad2403846..881547fc10 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml @@ -8,6 +8,6 @@ - id: ClothingHandsGlovesLatex - id: ClothingHeadsetScience - id: ClothingMaskSterile - - id: ClothingOuterCoatLab + - id: ClothingOuterCoatRnd - id: AnomalyScanner - id: NodeScanner diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index d50cace0cf..5c24c99518 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -78,7 +78,7 @@ - id: ClothingUniformJumpsuitScientist - id: ClothingBackpackScience - id: ClothingShoesColorWhite - - id: ClothingOuterCoatLab + - id: ClothingOuterCoatRnd - id: ClothingUniformJumpskirtScientist - id: ClothingEyesGlasses prob: 0.5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index 605b8f550d..b55a0b0814 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: RoboDrobeInventory startingInventory: - ClothingOuterCoatLab: 2 + ClothingOuterCoatRnd: 2 ClothingShoesColorBlack: 2 ClothingHandsGlovesFingerless: 2 ClothingHeadHatCorpsoft: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index f53af3b8f0..83562b174b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -7,7 +7,7 @@ ClothingUniformJumpsuitScientist: 3 ClothingUniformJumpskirtScientist: 3 ClothingUniformJumpsuitScientistFormal: 3 - ClothingOuterCoatLab: 3 + ClothingOuterCoatRnd: 3 ClothingShoesColorWhite: 3 ClothingNeckTieSci: 3 ClothingHeadsetScience: 3 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 0429396d64..7d5e62e1d7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -158,6 +158,21 @@ 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 @@ -219,4 +234,3 @@ sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 25aa8b2037..d3e54f579c 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -27,7 +27,7 @@ jumpsuit: ClothingUniformJumpsuitResearchDirector back: ClothingBackpackResearchDirectorFilled shoes: ClothingShoesColorBrown - outerClothing: ClothingOuterCoatLab + outerClothing: ClothingOuterCoatRnd id: RnDPDA ears: ClothingHeadsetRD innerclothingskirt: ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index debec221a6..a60a0da64b 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -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 index 0000000000..9f5f13f374 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 index 0000000000..89c2f1a789 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 index 0000000000..bd519b3bc6 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 index 0000000000..16b102cbb6 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 index 0000000000..4bf1ce711f 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 index 0000000000..442bfb2920 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.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 + } + ] +} 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 index 0000000000..1f83265b57 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 index 0000000000..26764735cc 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 index 0000000000..5d9906772f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png differ