Pharmacist clothes and prescriptions (#6178)
* Assets from the pharmacology branch to pharmacology2 branch Clothing, stamps and prescription paper. * Fixed bugs from porting clothes * Fixes bugs * Update medical.yml * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added prescription folder * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update coats.yml * Update Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/coats.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --------- Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
|
|
@ -5,3 +5,4 @@ stamp-component-stamped-name-prosec = Prosecutor
|
|||
stamp-component-stamped-name-hate-paperwork = I HATE PAPERWORK!
|
||||
stamp-component-stamped-name-nanotrasen = Nanotrasen
|
||||
stamp-component-stamped-name-NTAgent = INTERNAL AFFAIRS
|
||||
stamp-component-stamped-name-chemist = Chemist
|
||||
|
|
|
|||
|
|
@ -1861,6 +1861,9 @@
|
|||
# Begin of DeltaV Additions
|
||||
- ChemistFormalSuit
|
||||
- ChemistFormalSkirt # more jumpskirts
|
||||
- PharmacistJumpsuit
|
||||
- PharmacistJumpskirt
|
||||
- PharmacistJumpsuitFormal
|
||||
- SeniorChemistJumpsuit # Medical Clothing Overhaul
|
||||
- SeniorChemistJumpskirt # Medical Clothing Overhaul
|
||||
- OrangeTurtleneckJumpsuit
|
||||
|
|
@ -1874,6 +1877,7 @@
|
|||
loadouts:
|
||||
- RegularLabCoat
|
||||
- ChemistLabCoat
|
||||
- PharmacistLabCoat # DeltaV
|
||||
- SeniorChemistLabCoat # DeltaV - Medical Clothing Overhaul
|
||||
- LongLabCoat # DeltaV - Medical Clothing Overhaul
|
||||
- ChemistLongLabCoat # DeltaV - Medical Clothing Overhaul
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
- id: ClothingUniformJumpskirtPsychologist
|
||||
- id: DrinkWhiskeyBottleFull
|
||||
- id: ClothingHeadsetMedical
|
||||
- id: PrescriptionFolder
|
||||
|
||||
- type: entity
|
||||
parent: LockerPsychologist
|
||||
|
|
@ -182,6 +183,8 @@
|
|||
table: !type:AllSelector
|
||||
children:
|
||||
- id: Skimmer
|
||||
- id: PrescriptionFolder
|
||||
- id: RubberStampChemist
|
||||
|
||||
- type: entity
|
||||
parent: LockerParamedic
|
||||
|
|
|
|||
|
|
@ -371,3 +371,16 @@
|
|||
parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatParamedicJacket]
|
||||
id: ClothingOuterCoatParamedicJacketOpened
|
||||
name: paramedic jacket
|
||||
|
||||
## Chemist
|
||||
|
||||
- type: entity
|
||||
parent: [ ClothingOuterStorageFoldableBase, ClothingOuterCoatLabMedical ]
|
||||
id: ClothingOuterCoatLabPharma
|
||||
name: pharmacist lab coat
|
||||
description: A suit that protects against minor chemical spills. Has an orange and blue stripe on the shoulder and arm.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _DV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi
|
||||
- type: Clothing
|
||||
sprite: _DV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi
|
||||
|
|
|
|||
|
|
@ -518,3 +518,14 @@
|
|||
sprite: _DV/Clothing/Uniforms/Jumpskirt/chemistry_senior.rsi
|
||||
- type: Clothing
|
||||
sprite: _DV/Clothing/Uniforms/Jumpskirt/chemistry_senior.rsi
|
||||
|
||||
- type: entity
|
||||
parent: ClothingUniformSkirtBase
|
||||
id: ClothingUniformJumpskirtPharmacist
|
||||
name: pharmacist jumpskirt
|
||||
description: There's still some odd stains on this jumpskirt. Hm.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _DV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi
|
||||
- type: Clothing
|
||||
sprite: _DV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi
|
||||
|
|
|
|||
|
|
@ -465,6 +465,28 @@
|
|||
- type: Clothing
|
||||
sprite: _DV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
|
||||
|
||||
- type: entity
|
||||
parent: ClothingUniformBase
|
||||
id: ClothingUniformJumpsuitPharmacistShirt
|
||||
name: pharmacist formal suit
|
||||
description: A formal suit for the pharmacist. It has a few stains on it, but it's still presentable.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _DV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi
|
||||
- type: Clothing
|
||||
sprite: _DV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi
|
||||
|
||||
- type: entity
|
||||
parent: ClothingUniformBase
|
||||
id: ClothingUniformJumpsuitPharmacist
|
||||
name: pharmacist jumpsuit
|
||||
description: There's still some odd stains on this jumpsuit. Hm.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _DV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi
|
||||
- type: Clothing
|
||||
sprite: _DV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi
|
||||
|
||||
- type: entity
|
||||
parent: ClothingUniformBase
|
||||
id: ClothingUniformJumpsuitProsecutor
|
||||
|
|
|
|||
|
|
@ -581,3 +581,73 @@
|
|||
[bold]Results:[/bold] Negative
|
||||
[bold]Notes:[/bold] I feel like I am close. All previous tests have indicated the components are correct. However, it seems we have been missing a step.
|
||||
[bold]Synopsis:[/bold] Further testing and analysis needed.
|
||||
|
||||
- type: entity
|
||||
name: pharmacy prescription
|
||||
parent: Paper
|
||||
id: PaperPrescription
|
||||
description: 'A piece of paper to justify the reagents you carry on your person. Issued by the pharmacist.'
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Misc/bureaucracy.rsi
|
||||
layers:
|
||||
- state: paper
|
||||
color: "#ead9cc"
|
||||
- state: paper_words
|
||||
map: ["enum.PaperVisualLayers.Writing"]
|
||||
color: "#ead9cc"
|
||||
visible: false
|
||||
- state: paper_stamp-generic
|
||||
map: ["enum.PaperVisualLayers.Stamp"]
|
||||
visible: false
|
||||
- type: PaperVisuals
|
||||
headerImagePath: "/Textures/_DV/Interface/Paper/paper_heading_prescription.svg.200dpi.png"
|
||||
headerMargin: 0.0, 0.0, 10.0, 16.0
|
||||
backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
|
||||
backgroundModulate: "#ead9cc"
|
||||
backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
|
||||
contentMargin: 32.0, 16.0, 32.0, 0.0
|
||||
- type: Tag
|
||||
tags:
|
||||
- Document
|
||||
- Paper
|
||||
|
||||
- type: entity
|
||||
name: prescription folder
|
||||
parent: BoxBase
|
||||
id: PrescriptionFolder
|
||||
description: 'A folder to hold your prescriptions.'
|
||||
components:
|
||||
- type: Item
|
||||
size: Small
|
||||
shape: null
|
||||
- type: Sprite
|
||||
sprite: Objects/Misc/folders.rsi
|
||||
layers:
|
||||
- state: folder-white
|
||||
- state: folder-base
|
||||
- type: ItemMapper
|
||||
mapLayers:
|
||||
folder-overlay-paper:
|
||||
whitelist:
|
||||
tags:
|
||||
- Document
|
||||
- type: Storage
|
||||
maxItemSize: Small
|
||||
grid:
|
||||
- 0,0,1,2
|
||||
whitelist:
|
||||
tags:
|
||||
- Document
|
||||
- type: Appearance
|
||||
- type: Tag
|
||||
tags:
|
||||
- Folder
|
||||
- type: StorageFill
|
||||
contents:
|
||||
- id: PaperPrescription
|
||||
- id: PaperPrescription
|
||||
- id: PaperPrescription
|
||||
- id: PaperPrescription
|
||||
- id: PaperPrescription
|
||||
- id: PaperPrescription
|
||||
|
|
|
|||
|
|
@ -79,3 +79,17 @@
|
|||
stampState: "paper_stamp-cap"
|
||||
- type: Sprite
|
||||
state: stamp-cap
|
||||
|
||||
- type: entity
|
||||
name: chemist's rubber stamp
|
||||
parent: RubberStampBase
|
||||
id: RubberStampChemist
|
||||
suffix: DO NOT MAP
|
||||
components:
|
||||
- type: Stamp
|
||||
stampedName: stamp-component-stamped-name-chemist
|
||||
stampedColor: "#ff7900"
|
||||
stampState: "paper_stamp-chemist"
|
||||
- type: Sprite
|
||||
sprite: _DV/Objects/Misc/stamps.rsi
|
||||
state: stamp-chemist
|
||||
|
|
|
|||
|
|
@ -9,6 +9,21 @@
|
|||
equipment:
|
||||
jumpsuit: ClothingUniformJumpskirtChemShirt
|
||||
|
||||
- type: loadout
|
||||
id: PharmacistJumpsuit
|
||||
equipment:
|
||||
jumpsuit: ClothingUniformJumpsuitPharmacist
|
||||
|
||||
- type: loadout
|
||||
id: PharmacistJumpskirt
|
||||
equipment:
|
||||
jumpsuit: ClothingUniformJumpskirtPharmacist
|
||||
|
||||
- type: loadout
|
||||
id: PharmacistJumpsuitFormal
|
||||
equipment:
|
||||
jumpsuit: ClothingUniformJumpsuitPharmacistShirt
|
||||
|
||||
- type: loadout
|
||||
id: SeniorChemistJumpsuit
|
||||
effects:
|
||||
|
|
@ -53,6 +68,11 @@
|
|||
equipment:
|
||||
outerClothing: ClothingOuterCoatLabLongChemist
|
||||
|
||||
- type: loadout
|
||||
id: PharmacistLabCoat
|
||||
equipment:
|
||||
outerClothing: ClothingOuterCoatLabPharma
|
||||
|
||||
# Gloves
|
||||
- type: loadout
|
||||
id: ChemistGloves
|
||||
|
|
|
|||
|
|
@ -243,6 +243,9 @@
|
|||
{
|
||||
"name": "paper_stamp-wizard"
|
||||
},
|
||||
{
|
||||
"name": "paper_stamp-chemist"
|
||||
},
|
||||
{
|
||||
"name": "hitman_card"
|
||||
}
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 579 B |
|
Before Width: | Height: | Size: 616 B After Width: | Height: | Size: 617 B |
|
Before Width: | Height: | Size: 909 B After Width: | Height: | Size: 888 B |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 984 B |
|
After Width: | Height: | Size: 950 B |
|
After Width: | Height: | Size: 997 B |
|
After Width: | Height: | Size: 997 B |
|
|
@ -0,0 +1,41 @@
|
|||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Modified by BriBrooo for the pharmacist's labcoat. Made by Flareguy for Space Station 14, original base sprite 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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 997 B |
|
After Width: | Height: | Size: 997 B |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 875 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Modified by Bribrooo (github). Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "equipped-INNERCLOTHING",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 880 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Modified by Bribrooo (github). from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "equipped-INNERCLOTHING",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 860 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Sprited by BriBrooo. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand original sprite scaled down by potato1234_x, original monkey sprite made by brainfood1183 (github) for ss14",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "equipped-INNERCLOTHING",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
|
||||
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||
width="142.000000pt" height="160.000000pt" viewBox="0 0 142.000000 160.000000"
|
||||
preserveAspectRatio="xMidYMid meet">
|
||||
|
||||
<g transform="translate(0.000000,160.000000) scale(0.100000,-0.100000)"
|
||||
fill="#000000" stroke="none">
|
||||
<path d="M524 1581 c-109 -49 -156 -206 -94 -308 37 -61 105 -100 273 -155
|
||||
197 -64 217 -79 217 -165 0 -99 -49 -179 -130 -213 -27 -11 -30 -17 -30 -56
|
||||
l0 -43 33 6 c85 16 183 95 227 183 27 53 37 153 21 203 -25 74 -122 132 -262
|
||||
157 -193 34 -275 86 -295 189 -15 74 50 161 119 161 43 0 96 -29 113 -62 15
|
||||
-28 14 -31 -7 -54 -20 -21 -21 -28 -11 -61 13 -43 66 -107 85 -101 18 6 39 56
|
||||
45 105 4 35 0 48 -16 66 -12 12 -28 38 -36 57 -40 97 -151 137 -252 91z"/>
|
||||
<path d="M0 1020 c0 -14 49 -37 95 -45 74 -14 144 -46 222 -102 139 -100 239
|
||||
-143 330 -143 l33 0 0 -130 0 -130 30 0 30 0 0 134 0 134 25 6 c34 9 93 62
|
||||
114 105 27 52 35 116 21 152 l-12 29 -444 0 c-282 0 -444 -4 -444 -10z"/>
|
||||
<path d="M1067 978 c3 -30 -2 -74 -10 -100 -17 -54 -19 -54 66 8 62 46 135 77
|
||||
207 89 46 8 90 30 90 46 0 5 -80 9 -178 9 l-179 0 4 -52z"/>
|
||||
<path d="M578 691 c-57 -36 -78 -74 -78 -139 0 -65 30 -109 95 -142 69 -34
|
||||
187 -35 257 -1 68 33 108 82 108 131 0 35 -5 43 -32 60 -33 20 -99 26 -145 14
|
||||
-17 -5 -23 -14 -23 -35 0 -26 3 -29 34 -29 69 0 49 -70 -26 -90 -45 -13 -96
|
||||
-7 -139 16 -50 25 -47 105 6 140 20 13 25 24 25 60 0 54 -16 57 -82 15z"/>
|
||||
<path d="M624 546 c-15 -12 -17 -18 -8 -33 18 -29 39 -22 42 15 4 35 -4 39
|
||||
-34 18z"/>
|
||||
<path d="M540 361 c0 -56 28 -105 75 -132 17 -10 73 -22 130 -29 55 -6 113
|
||||
-16 128 -22 15 -6 31 -7 35 -3 13 13 -47 53 -90 59 -141 22 -181 43 -198 106
|
||||
-8 28 -20 44 -40 55 -16 8 -31 15 -35 15 -3 0 -5 -22 -5 -49z"/>
|
||||
<path d="M682 318 c3 -39 6 -43 31 -46 26 -3 27 -2 27 42 0 45 -1 46 -31 46
|
||||
-29 0 -30 -1 -27 -42z"/>
|
||||
<path d="M680 157 c0 -42 -25 -66 -87 -83 -27 -7 -66 -20 -88 -28 -22 -8 -56
|
||||
-15 -76 -16 -19 0 -44 -7 -55 -15 -17 -13 22 -14 336 -14 298 0 352 2 337 13
|
||||
-9 7 -42 16 -73 20 -31 3 -65 11 -76 17 -11 6 -45 17 -76 25 -63 16 -82 34
|
||||
-82 75 0 19 -6 28 -22 33 -36 9 -38 8 -38 -27z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 8.1 KiB |
|
|
@ -0,0 +1,2 @@
|
|||
sample:
|
||||
filter: true
|
||||
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 4.8 KiB |
|
|
@ -0,0 +1,2 @@
|
|||
sample:
|
||||
filter: true
|
||||
|
|
@ -27,6 +27,9 @@
|
|||
},
|
||||
{
|
||||
"name": "stamp-warden"
|
||||
},
|
||||
{
|
||||
"name": "stamp-chemist"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 713 B |