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

Патолог(перезалив) #160

Merged
merged 24 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f05c512
патолог
Darkiich Jul 31, 2024
d420977
так и быть, уберу дубликат
Darkiich Jul 31, 2024
2c97197
добавил спрайты
Darkiich Jul 31, 2024
05f35e7
еще добавил спрайты
Darkiich Jul 31, 2024
0ff6b9b
фиксим ямл
Darkiich Jul 31, 2024
9c5715a
добавил в мету спрайт
Darkiich Jul 31, 2024
7257951
боже, еще добавил спрайты
Darkiich Jul 31, 2024
d148343
ревью
Darkiich Aug 1, 2024
0837737
забыл
Darkiich Aug 1, 2024
e2ec1c0
добавил базовый пда для нас
Darkiich Aug 1, 2024
ae640dd
убрал icon у пда
Darkiich Aug 1, 2024
e47b24b
ну пытаемся исправлять ошибки
Darkiich Aug 1, 2024
6a710cb
фиксим
Darkiich Aug 1, 2024
c34f55e
добавил state
Darkiich Aug 1, 2024
887e7b5
добавил icon
Darkiich Aug 1, 2024
4ff0029
короче, меня это заебало
Darkiich Aug 1, 2024
81ad169
Revert "короче, меня это заебало"
Darkiich Aug 1, 2024
98b770c
Revert "добавил icon"
Darkiich Aug 1, 2024
685dcff
Revert "добавил state"
Darkiich Aug 1, 2024
1740309
Revert "фиксим"
Darkiich Aug 1, 2024
b1a3e91
Revert "ну пытаемся исправлять ошибки"
Darkiich Aug 1, 2024
91f00f6
Revert "убрал icon у пда"
Darkiich Aug 1, 2024
8473e85
Revert "добавил базовый пда для нас"
Darkiich Aug 1, 2024
e4a4c31
Revert "забыл"
Darkiich Aug 1, 2024
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
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Adverisements/patholog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
advertisement-patholog-1 = Только не запачкайтесь.
advertisement-patholog-2 = Самая красивая одежда среди обитателей морга!
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingBackpackPathologistFilled = { ent-ADTClothingBackpackPathologist }
.desc = { ent-ADTClothingBackpackPathologist.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingBackpackDuffelPathologistFilled = { ent-ADTClothingBackpackDuffelPathologist }
.desc = { ent-ADTClothingBackpackDuffelPathologist.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingBackpackSatchelPathologistFilled = { ent-ADTClothingBackpackSatchelPathologist }
.desc = { ent-ADTClothingBackpackSatchelPathologist.desc }
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Back/backpack.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоанатома
.desc = Большой вещмешок для хранения инструментов и бумаг.
ent-ADTClothingBackpackPathologist = рюкзак патологоанатома
.desc = Рюкзак для хранения инструментов и бумаг.
ent-ADTClothingBackpackSatchelPathologist = сумка патологоанатома
.desc = Сумка для хранения инструментов и бумаг.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/coats.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома
.desc = { ent-ClothingOuterCoatLab.desc }
ent-ADTClothingOuterApronPathologist = фартук патологоанатома
.desc = Фартук для работы с трупами.
8 changes: 8 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
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 = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTPathologistPDA = КПК патологоанатома
.desc = От него веет прохладой.
Comment on lines +1 to +2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

меняем путь Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl на Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTPathologistIDCard = ID карта патологоанатома
.desc = { ent-IDCardStandard.desc }
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Spawners/jobs.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-SpawnPointADTPathologist = патологоанатом
.desc = { ent-MarkerBase.desc }
Comment on lines +1 to +2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resources/Locale/ru-RU/ADT/Entities/Spawners/jobs.ftl на /ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTVendingMachinePatholoDrobe = ПатологоШкаф
.desc = Самая стильная одежда в самом отдалёном месте медицинского отдела.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/Job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
job-name-ADTPathologist = Патологоанатом
JobADTPathologist = Патологоанатом
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl
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 = Патологоанатом, рюкзак
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
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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: localizedDataset
id: PatholodrobeAds
values:
prefix: advertisement-patholog-
count: 2

This file was deleted.

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
20 changes: 20 additions & 0 deletions Resources/Prototypes/ADT/Clothing/Back/backpacks.yml
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
11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Clothing/OuterClothing/coats.yml
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
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Clothing/OuterClothing/misc.yml
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
21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Clothing/Uniforms/Jumpskirt.yml
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
21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Clothing/Uniforms/Jumpsuit.yml
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
1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Entities/Clothing/Back/fill.txt

This file was deleted.

23 changes: 23 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
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
14 changes: 14 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml
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
1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Entities/Objects/Misc/fill.txt

This file was deleted.

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

This file was deleted.

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"
Loading
Loading