-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> Этот ПР переносит патолога **Медиа** <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> 🆑 - add: Добавлен патолог
- Loading branch information
Showing
110 changed files
with
799 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
advertisement-patholog-1 = Только не запачкайтесь. | ||
advertisement-patholog-2 = Самая красивая одежда среди обитателей морга! |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/backpack.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTClothingBackpackPathologistFilled = { ent-ADTClothingBackpackPathologist } | ||
.desc = { ent-ADTClothingBackpackPathologist.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/duffelbag.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTClothingBackpackDuffelPathologistFilled = { ent-ADTClothingBackpackDuffelPathologist } | ||
.desc = { ent-ADTClothingBackpackDuffelPathologist.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/satchel.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTClothingBackpackSatchelPathologistFilled = { ent-ADTClothingBackpackSatchelPathologist } | ||
.desc = { ent-ADTClothingBackpackSatchelPathologist.desc } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоанатома | ||
.desc = Большой вещмешок для хранения инструментов и бумаг. | ||
ent-ADTClothingBackpackPathologist = рюкзак патологоанатома | ||
.desc = Рюкзак для хранения инструментов и бумаг. | ||
ent-ADTClothingBackpackSatchelPathologist = сумка патологоанатома | ||
.desc = Сумка для хранения инструментов и бумаг. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома | ||
.desc = { ent-ClothingOuterCoatLab.desc } | ||
ent-ADTClothingOuterApronPathologist = фартук патологоанатома | ||
.desc = Фартук для работы с трупами. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
ent-ADTClothingUniformPathologistSuit = костюм патологоанатома | ||
.desc = Лёгкий комбинезон для работника морга. | ||
ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома | ||
.desc = Лёгкая юбка-комбинезон для работницы морга. | ||
ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома | ||
.desc = Лёгкий комбинезон для работника морга. Более угрюмая версия. | ||
ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома | ||
.desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTPathologistPDA = КПК патологоанатома | ||
.desc = От него веет прохладой. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTPathologistIDCard = ID карта патологоанатома | ||
.desc = { ent-IDCardStandard.desc } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-SpawnPointADTPathologist = патологоанатом | ||
.desc = { ent-MarkerBase.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/Entities/Structuries/Machines/vending_machines.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTVendingMachinePatholoDrobe = ПатологоШкаф | ||
.desc = Самая стильная одежда в самом отдалёном месте медицинского отдела. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
job-name-ADTPathologist = Патологоанатом | ||
JobADTPathologist = Патологоанатом |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
loadout-group-patholog-head = Патологоанатом, голова | ||
loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон | ||
loadout-group-patholog-outerclothing = Патологоанатом, верхняя одежда | ||
loadout-group-patholog-shoes = Патологоанатом, обувь | ||
loadout-group-patholog-backpack = Патологоанатом, рюкзак |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
noSpawn: true | ||
parent: ADTClothingBackpackPathologist | ||
id: ADTClothingBackpackPathologistFilled | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BoxSurvivalMedical | ||
- id: BodyBagFolded | ||
# До добавления слота носков- id: ADTFootTag | ||
- id: SpaceCash500 |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
noSpawn: true | ||
parent: ADTClothingBackpackDuffelPathologist | ||
id: ADTClothingBackpackDuffelPathologistFilled | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BoxSurvivalMedical | ||
- id: BodyBagFolded | ||
# До добавления слота носков- id: ADTFootTag | ||
- id: SpaceCash500 |
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/fill.txt
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
noSpawn: true | ||
parent: ADTClothingBackpackSatchelPathologist | ||
id: ADTClothingBackpackSatchelPathologistFilled | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BoxSurvivalMedical | ||
- id: BodyBagFolded | ||
# До добавления слота носков - id: ADTFootTag | ||
- id: SpaceCash500 |
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/fill.txt
This file was deleted.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patcholodrobe.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
- type: localizedDataset | ||
id: PatholodrobeAds | ||
values: | ||
prefix: advertisement-patholog- | ||
count: 2 |
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/fill.txt
This file was deleted.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patcholodrobe.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
- type: vendingMachineInventory | ||
id: PatholodrobeInventory | ||
startingInventory: | ||
ADTClothingUniformPathologistSuit: 2 | ||
ADTClothingUniformPathologistSkirt: 2 | ||
ADTClothingUniformPathologistSuitAlt: 2 | ||
ADTClothingUniformPathologistSkirtAlt: 2 | ||
ADTClothingOuterApronPathologist: 2 | ||
ADTClothingOuterCoatLabPathologist: 2 | ||
ClothingShoesColorWhite: 2 | ||
ADTClothingBackpackPathologist: 2 | ||
ADTClothingBackpackDuffelPathologist: 2 | ||
ADTClothingBackpackSatchelPathologist: 2 | ||
ClothingHandsGlovesLatex: 2 | ||
ClothingMaskSterile: 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
- type: entity | ||
parent: ClothingBackpackDuffelMedical | ||
id: ADTClothingBackpackDuffelPathologist | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Back/pathologist_duffel.rsi | ||
|
||
- type: entity | ||
parent: ClothingBackpackMedical | ||
id: ADTClothingBackpackPathologist | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Back/pathologist_backpack.rsi | ||
|
||
- type: entity | ||
parent: ClothingBackpackSatchelMedical | ||
id: ADTClothingBackpackSatchelPathologist | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Back/pathologist_satchel.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
parent: ClothingOuterCoatLab | ||
id: ADTClothingOuterCoatLabPathologist | ||
name: pathologist's lab coat | ||
description: A suit that protects against minor chemical spills. But still a bit too white for blood stains. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi | ||
state: icon-open | ||
- type: Clothing | ||
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- type: entity | ||
parent: ClothingOuterStorageBase | ||
id: ADTClothingOuterApronPathologist | ||
name: pathologist's apron | ||
description: An apron used by pathologists. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
- type: entity | ||
parent: ClothingUniformBase | ||
id: ADTClothingUniformPathologistSkirt | ||
name: pathologist jumpskirt | ||
description: A lightweight jumpskirt for a morgue worker | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi | ||
|
||
- type: entity | ||
parent: ClothingUniformBase | ||
id: ADTClothingUniformPathologistSkirtAlt | ||
name: pathologist jumpskirt | ||
description: A lightweight jumpskirt for a morgue worker. A darker version. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
- type: entity | ||
parent: ClothingUniformBase | ||
id: ADTClothingUniformPathologistSuit | ||
name: pathologist jumpsuit | ||
description: A lightweight jumpsuit for a morgue worker | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi | ||
|
||
- type: entity | ||
parent: ClothingUniformBase | ||
id: ADTClothingUniformPathologistSuitAlt | ||
name: pathologist jumpsuit | ||
description: A lightweight jumpsuit for a morgue worker. A darker version. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi |
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
|
||
- type: entity | ||
id: ADTSpawnPointJobBase | ||
parent: MarkerBase | ||
abstract: true | ||
suffix: Job Spawn ADT | ||
components: | ||
- type: SpawnPoint | ||
spawn_type: Job | ||
- type: Sprite | ||
sprite: ADT/Markers/job.rsi | ||
|
||
- type: entity | ||
id: SpawnPointADTPathologist | ||
parent: ADTSpawnPointJobBase | ||
name: pathologist | ||
components: | ||
- type: SpawnPoint | ||
job_id: ADTPathologist | ||
- type: Sprite | ||
layers: | ||
- state: green | ||
- state: pathologist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
- type: entity | ||
parent: MedicalPDA | ||
id: ADTPathologistPDA | ||
name: pathologist's PDA | ||
description: It breezes chill. | ||
components: | ||
- type: Pda | ||
id: ADTPathologistIDCard | ||
state: pda-pathologist | ||
- type: PdaBorderColor | ||
borderColor: "#d7d7d0" | ||
accentVColor: "#15616b" | ||
- type: Icon | ||
state: pda-pathologist |
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
- type: entity | ||
parent: IDCardStandard | ||
id: ADTPathologistIDCard | ||
name: pathologist's ID card | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Misc/id_cards.rsi | ||
layers: | ||
- state: default | ||
- state: id-pathologist | ||
- type: PresetIdCard | ||
job: ADTPathologist |
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Entities/Structures/Machines/Computers/fill.txt
This file was deleted.
Oops, something went wrong.
29 changes: 29 additions & 0 deletions
29
Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
- type: entity | ||
parent: VendingMachine | ||
id: ADTVendingMachinePatholoDrobe | ||
name: PatholoDrobe | ||
description: A vending machine that dispences new clothing for pathologists. | ||
components: | ||
- type: VendingMachine | ||
pack: PatholodrobeInventory | ||
offState: off | ||
brokenState: broken | ||
normalState: normal-unshaded | ||
- type: Advertise | ||
pack: PatholodrobeAds | ||
- type: Sprite | ||
sprite: ADT/Structures/Machines/VendingMachines/patholodrobe.rsi | ||
layers: | ||
- state: "off" | ||
map: ["enum.VendingMachineVisualLayers.Base"] | ||
- state: "off" | ||
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] | ||
shader: unshaded | ||
- state: panel | ||
map: ["enum.WiresVisualLayers.MaintenancePanel"] | ||
- type: AccessReader | ||
access: [["Medical"]] | ||
- type: PointLight | ||
radius: 1.8 | ||
energy: 1.6 | ||
color: "#1ca9d4" |
Oops, something went wrong.