Skip to content
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 @@ -271,6 +271,7 @@
id: SterileMask
equipment:
mask: ClothingMaskSterile
groupBy: "mask" # Omu

#Eyewear
- type: loadout
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1738,6 +1738,16 @@
minLimit: 0
loadouts:
- SterileMask
# Omustation Changes Start - Sterile Masks
- SterileMaskRed
- SterileMaskOrange
- SterileMaskYellow
- SterileMaskGreen
- SterileMaskBlue
- SterileMaskPurple
- SterileMaskWhite
- SterileMaskBlack
# Omustation Changes End

- type: loadoutGroup
id: MedicalInternJumpsuit
Expand Down
96 changes: 96 additions & 0 deletions Resources/Prototypes/_Omu/Entities/Clothing/Mask/masks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
## Sterile Masks
# Red
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileRed
name: red sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and stolen equipment. # Cybersun Paramed Colors
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterilered.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterilered.rsi

# Orange
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileOrange
name: orange sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and chemical burns. # Chemistry
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterileorange.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterileorange.rsi

# Yellow
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileYellow
name: yellow sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and corporate hellscapes. # EMT/Edgerunner Jacket
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterileyellow.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterileyellow.rsi

# Green
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileGreen
name: green sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and neglect. # Virology
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterilegreen.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterilegreen.rsi

# Blue
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileBlue
name: blue sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and doctors. # Medical Generic
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterileblue.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterileblue.rsi

# Purple
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterilePurple
name: purple sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and explosions. # Science
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterilepurple.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterilepurple.rsi

# Black
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileBlack
name: black sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of dye and space. # Military MD Jumpsuit
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterileblack.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterileblack.rsi

# White
- type: entity
parent: ClothingMaskSterile
id: ClothingMaskSterileWhite
name: white sterile mask
description: A sterile mask designed to help prevent the spread of diseases. Smells faintly of bleach and more bleach. # Base Omu Labcoat Coloring
components:
- type: Sprite
sprite: _Omu/Clothing/Mask/sterilewhite.rsi
- type: Clothing
sprite: _Omu/Clothing/Mask/sterilewhite.rsi
53 changes: 51 additions & 2 deletions Resources/Prototypes/_Omu/Loadouts/Jobs/Medical/medical_doctor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
equipment:
gloves: ClothingHandsGlovesCybersunNitrile

# Uniforms
# Uniforms
- type: loadout
id: CybersunMedicalJumpsuit
equipment:
Expand All @@ -27,4 +27,53 @@
- !type:GroupLoadoutEffect
proto: SeniorPhysician
equipment:
outerClothing: ClothingOuterJacketSeniorPhys
outerClothing: ClothingOuterJacketSeniorPhys

#Masks
- type: loadout
id: SterileMaskRed
equipment:
mask: ClothingMaskSterileRed
groupBy: "mask"

- type: loadout
id: SterileMaskOrange
equipment:
mask: ClothingMaskSterileOrange
groupBy: "mask"

- type: loadout
id: SterileMaskYellow
equipment:
mask: ClothingMaskSterileYellow
groupBy: "mask"

- type: loadout
id: SterileMaskGreen
equipment:
mask: ClothingMaskSterileGreen
groupBy: "mask"

- type: loadout
id: SterileMaskBlue
equipment:
mask: ClothingMaskSterileBlue
groupBy: "mask"

- type: loadout
id: SterileMaskPurple
equipment:
mask: ClothingMaskSterilePurple
groupBy: "mask"

- type: loadout
id: SterileMaskBlack
equipment:
mask: ClothingMaskSterileBlack
groupBy: "mask"

- type: loadout
id: SterileMaskWhite
equipment:
mask: ClothingMaskSterileWhite
groupBy: "mask"
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.
58 changes: 58 additions & 0 deletions Resources/Textures/_Omu/Clothing/Mask/sterileblack.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e, equipped-MASK-feroxi by RedTerror | Greyscaled by DuskTheSnep",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
},
{
"name": "equipped-MASK-vox",
"directions": 4
},
{
"name": "up-equipped-MASK",
"directions": 4
},
{
"name": "up-equipped-MASK-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "up-equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-feroxi",
"directions": 4
},
{
"name": "up-equipped-MASK-feroxi",
"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.
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.
58 changes: 58 additions & 0 deletions Resources/Textures/_Omu/Clothing/Mask/sterileblue.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e, equipped-MASK-feroxi by RedTerror | Greyscaled by DuskTheSnep",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
},
{
"name": "equipped-MASK-vox",
"directions": 4
},
{
"name": "up-equipped-MASK",
"directions": 4
},
{
"name": "up-equipped-MASK-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "up-equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-feroxi",
"directions": 4
},
{
"name": "up-equipped-MASK-feroxi",
"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.
58 changes: 58 additions & 0 deletions Resources/Textures/_Omu/Clothing/Mask/sterilegreen.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e, equipped-MASK-feroxi by RedTerror | Greyscaled by DuskTheSnep",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-reptilian",
"directions": 4
},
{
"name": "equipped-MASK-vox",
"directions": 4
},
{
"name": "up-equipped-MASK",
"directions": 4
},
{
"name": "up-equipped-MASK-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "up-equipped-MASK-vulpkanin",
"directions": 4
},
{
"name": "equipped-MASK-feroxi",
"directions": 4
},
{
"name": "up-equipped-MASK-feroxi",
"directions": 4
}
]
}
Loading
Loading