Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cosmetic Drip 3.1 ~ Labcoats #438

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
ClothingUniformJumpsuitChemistry: 2
ClothingUniformJumpskirtChemistry: 2
ClothingOuterCoatLabChem: 2
ClothingOuterCoatStylishLabChem: 2
ClothingShoesColorWhite: 2
ClothingBackpackChemistry: 2
ClothingBackpackSatchelChemistry: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
ClothingHeadHatBeretMedic: 4
ClothingHeadNurseHat: 4
ClothingOuterCoatLab: 4
ClothingOuterCoatStylishLab: 4
ClothingShoesColorWhite: 4
ClothingHandsGlovesLatex: 4
ClothingHandsGlovesNitrile: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
ClothingUniformJumpskirtVirology: 2
ClothingShoesColorWhite: 2
ClothingOuterCoatLabViro: 2
ClothingOuterCoatLabStylishViro: 2
ClothingOuterWinterViro: 2
ClothingMaskSterile: 2
ClothingBackpackVirology: 2
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@
minLimit: 0
loadouts:
- RegularLabCoat
- ModernLabCoat # CD
- ScienceLabCoat
- ScienceWintercoat
- RoboticistLabCoat
Expand Down Expand Up @@ -1141,6 +1142,7 @@
minLimit: 0
loadouts:
- ChiefMedicalOfficerLabCoat
- ChiefMedicalOfficerModernLabCoat # CD
- ChiefMedicalOfficerWintercoat

- type: loadoutGroup
Expand Down Expand Up @@ -1190,6 +1192,7 @@
minLimit: 0
loadouts:
- RegularLabCoat
- ModernLabCoat # CD
- MedicalDoctorWintercoat
# - SeniorPhysicianLabCoat

Expand Down Expand Up @@ -1250,7 +1253,9 @@
minLimit: 0
loadouts:
- RegularLabCoat
- ModernLabCoat # CD
- ChemistLabCoat
- ChemistModernLabCoat # CD
- ChemistWintercoat

- type: loadoutGroup
Expand Down
110 changes: 110 additions & 0 deletions Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,113 @@
sprite: _CD/Clothing/OuterClothing/Coats/Suits/blue.rsi
- type: Clothing
sprite: _CD/Clothing/OuterClothing/Coats/Suits/blue.rsi

# Labcoats

- type: entity
parent: ClothingOuterStorageFoldableBase
id: ClothingOuterCoatStylishLab
name: modern lab coat
description: A sleak suit that protects against minor chemical spills.
components:
- type: Sprite
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat.rsi
- type: Clothing
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75

- type: entity
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatStylishLab]
id: ClothingOuterCoatStylishLabOpened
name: modern lab coat


- type: entity
parent: ClothingOuterStorageFoldableBase
id: ClothingOuterCoatStylishLabChem
name: modern chemist lab coat
description: A sleak suit that protects against minor chemical spills. It has orange stripes on the shoulders
components:
- type: Sprite
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_chem.rsi
- type: Clothing
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_chem.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75

- type: entity
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatStylishLabChem]
id: ClothingOuterCoatStylishLabChemOpened
name: modern chemist lab coat


- type: entity
parent: ClothingOuterStorageFoldableBase
id: ClothingOuterCoatStylishLabCMO
name: chief medical officer's modern lab coat
description: Custom made sleek blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts.
components:
- type: Sprite
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_cmo.rsi
- type: Clothing
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_cmo.rsi
- type: Armor
modifiers:
coefficients:
Slash: 0.95
Heat: 0.95
Caustic: 0.65

- type: entity
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatStylishLabCMO]
id: ClothingOuterCoatStylishLabCMOOpened
name: chief medical officer's modern lab coat


- type: entity
parent: ClothingOuterStorageFoldableBase
id: ClothingOuterCoatLabStylishSeniorPhysician
name: modern senior physician lab coat
description: A sleak suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim.
components:
- type: Sprite
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_physician.rsi
- type: Clothing
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_physician.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75

- type: entity
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabStylishSeniorPhysician]
id: ClothingOuterCoatLabStylishSeniorPhysicianOpened
name: modern senior physician lab coat


- type: entity
parent: ClothingOuterStorageFoldableBase
id: ClothingOuterCoatLabStylishViro
name: modern virologist lab coat
description: A suit that protects against bacteria and viruses. Has an green stripe on the shoulder.
components:
- type: Sprite
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_viro.rsi
- type: Clothing
sprite: _CD/Clothing/OuterClothing/Coats/Labcoats/labcoat_viro.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75

- type: entity
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabStylishViro]
id: ClothingOuterCoatLabStylishViroOpened
name: modern virologist lab coat


5 changes: 5 additions & 0 deletions Resources/Prototypes/_CD/Loadouts/Jobs/Medical/chemist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# OuterClothing
- type: loadout
id: ChemistModernLabCoat
equipment:
outerClothing: ClothingOuterCoatStylishLabChem
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# OuterClothing
- type: loadout
id: ChiefMedicalOfficerModernLabCoat
equipment:
outerClothing: ClothingOuterCoatStylishLabCMO
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@
id: MedicalCasualsuit
equipment:
jumpsuit: ClothingUniformDoctorCasual


# OuterClothing
- type: loadout
id: ModernLabCoat
equipment:
outerClothing: ClothingOuterCoatStylishLab
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@
id: SeniorPhysicianLabCoat
equipment:
outerClothing: ClothingOuterCoatLabSeniorPhysician

- type: loadout
id: SeniorPhysicianModernLabCoat
equipment:
outerClothing: ClothingOuterCoatLabStylishSeniorPhysician
2 changes: 2 additions & 0 deletions Resources/Prototypes/_CD/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@
minLimit: 0
loadouts:
- SeniorPhysicianLabCoat
- SeniorPhysicianModernLabCoat
- RegularLabCoat
- ModernLabCoat
- MedicalDoctorWintercoat

- type: loadoutGroup
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "open-inhand-left",
"directions": 4
},
{
"name": "open-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "open-inhand-left",
"directions": 4
},
{
"name": "open-inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-open"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "open-equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "open-inhand-left",
"directions": 4
},
{
"name": "open-inhand-right",
"directions": 4
}
]
}
Loading
Loading