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

Patolog #30

Closed
wants to merge 80 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
e7bf9d8
роль патолога, переводы
Darkiich Jun 29, 2024
897ad1b
спавн, несколько вещей патолога, айди,тайм трекер
Darkiich Jun 29, 2024
59b0cc0
добавления guidbook'a для вещей
Darkiich Jun 29, 2024
b226f2d
Merge branch 'master' into patolog
Schrodinger71 Jun 29, 2024
09687df
фикс ямла?
Darkiich Jun 30, 2024
378a1c0
повторный фикс ямла?
Darkiich Jun 30, 2024
19af4fc
вещмешок
Darkiich Jun 30, 2024
65c972e
комбинезоны
Darkiich Jun 30, 2024
e45c48f
женские комбинезоны
Darkiich Jun 30, 2024
9d169dc
фартук
Darkiich Jun 30, 2024
244d9e1
халат
Darkiich Jun 30, 2024
2d8f892
пустой и заполненный рюкзак
Darkiich Jul 1, 2024
c8aa683
сумка
Darkiich Jul 1, 2024
2e4b898
костюмы биозащиты
Darkiich Jul 1, 2024
78b7c74
шкаф биозащиты
Darkiich Jul 1, 2024
e05c0cc
вендинг
Darkiich Jul 1, 2024
a6e8c0a
возможный фикс
Darkiich Jul 4, 2024
91d80cd
еще возможный фикс
Darkiich Jul 4, 2024
3ba6358
много фиксов
Darkiich Jul 4, 2024
ae136c0
НУ ВРОДЕ теперь нормально должно быть(fix)
Darkiich Jul 4, 2024
7a512cc
fuck you
Darkiich Jul 4, 2024
f734b34
еще фиксссс
Darkiich Jul 4, 2024
8a04d79
наверное все?
Darkiich Jul 4, 2024
ce20a0d
спрайты
Darkiich Jul 4, 2024
355bbf2
Fix YAML linter?
Schrodinger71 Jul 13, 2024
feac238
test
Schrodinger71 Jul 13, 2024
aab1e65
Fix YAML?
Schrodinger71 Jul 13, 2024
7310d91
вот теперь точно должен быть фикс YAMLa
Schrodinger71 Jul 13, 2024
85cc130
а если так
Schrodinger71 Jul 13, 2024
77d64a0
Rename Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets…
Schrodinger71 Jul 13, 2024
af939ac
Merge branch 'master' into patolog
Darkiich Jul 18, 2024
da87dfc
коммент носков pathologist.yml
Darkiich Jul 22, 2024
2b81dac
убрал комменты(ошибка не в этом) pathologist.yml
Darkiich Jul 22, 2024
9224898
Merge branch 'master' into patolog
Darkiich Jul 22, 2024
e2a998f
Update misc.yml
Darkiich Jul 22, 2024
612fa32
fuck u, а так ты будешь выдававть ошибку?! misc.yml
Darkiich Jul 22, 2024
8ca108c
lf
Darkiich Jul 22, 2024
feaffbc
разкоментить после добавленя fuck носков
Darkiich Jul 22, 2024
a596498
поможет или нет, вот в чем вопрос
Darkiich Jul 22, 2024
1c94032
спрайты карты
Darkiich Jul 22, 2024
7502441
спрайты вендинга
Darkiich Jul 22, 2024
99b04e5
пытаемс фиксить ямл
Darkiich Jul 22, 2024
f64bfcc
добавление инвенторя вендингу
Darkiich Jul 22, 2024
de0a19b
добавление речи вендингу
Darkiich Jul 22, 2024
b373d62
мешок для тел
Darkiich Jul 22, 2024
eb0ed25
добавление иконки для визора и коммент для одежды которую не перенесли
Darkiich Jul 22, 2024
5c4f18d
добавление гайдбука
Darkiich Jul 22, 2024
34fc7a0
хз, может поможет
Darkiich Jul 24, 2024
adec1a9
Revert "хз, может поможет"
Darkiich Jul 24, 2024
ba29586
[TODO] РАЗКОМЕНТИТЬ после решения всего ямла
Darkiich Jul 24, 2024
5713c71
исправил орфографическую ошибку
Darkiich Jul 24, 2024
392b778
фиксим
Darkiich Jul 24, 2024
077fc44
Revert "фиксим"
Darkiich Jul 24, 2024
9f457b9
изменил айди
Darkiich Jul 24, 2024
8c7338b
убираем дубликат
Darkiich Jul 24, 2024
8a43443
еще фиксим
Darkiich Jul 24, 2024
96cc699
фикс ямла
Darkiich Jul 27, 2024
69aaea8
УБРАТЬ КОММЕНТЫ после добавления системы выбора рюкзаков при старте
Darkiich Jul 27, 2024
4726ccb
ну можнт как-нибудь поможет
Darkiich Jul 27, 2024
5089f64
Revert "ну можнт как-нибудь поможет"
Darkiich Jul 27, 2024
f37271a
делаем как у других
Darkiich Jul 27, 2024
2fdf054
вырезаем ящик
Darkiich Jul 27, 2024
54547ff
исправляем ошибки молодости
Darkiich Jul 27, 2024
0e7454e
Merge branch 'AdventureTimeSS14:master' into patolog
Darkiich Jul 28, 2024
72e02e1
добавление патолога и не только его на карты
Darkiich Jul 28, 2024
60a9b72
еще добавляем на карты роли
Darkiich Jul 28, 2024
ade5dd3
Revert "добавление патолога и не только его на карты"
Darkiich Jul 28, 2024
0109284
Revert "еще добавляем на карты роли"
Darkiich Jul 28, 2024
3e7e098
локализация работы теперь в adt
Darkiich Jul 28, 2024
14d3bf5
перенос перевода рюкзаков в adt
Darkiich Jul 28, 2024
bf81b55
перенос перевода ящика в adt
Darkiich Jul 28, 2024
0be3bc6
перенос перевода в adt
Darkiich Jul 28, 2024
2c56ddb
перенос перевода КПК в adt
Darkiich Jul 28, 2024
69c8016
перенос перевода айди карты в adt
Darkiich Jul 28, 2024
a8d8175
добавляем обратно шкаф
Darkiich Jul 28, 2024
b4b9700
чиним
Darkiich Jul 28, 2024
04f653e
da
Darkiich Jul 28, 2024
a266585
Merge branch 'master' into patolog
Darkiich Jul 29, 2024
a140d5e
Revert "добавляем обратно шкаф"
Darkiich Jul 29, 2024
acab645
убираем лишнее
Darkiich Jul 29, 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/Advertisments/patholog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
advertisement-patholog-1 = Только не запачкайтесь.
advertisement-patholog-2 = Самая красивая одежда среди обитателей морга!
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
advertisement-pill-1 = Утопите боль в таблетках!
advertisement-pill-2 = Хочешь витаминку?
advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примете таблетку галоперидола!
advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата!
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 }
10 changes: 10 additions & 0 deletions Resources/Locale/ru-RU/ADT/Catalog/Fills/Lockers/biohazard.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ADTClosetL3 = шкаф снаряжения 3-го уровня биологической опасности
.desc = Это хранилище для снаряжения 3-го уровня биологической опасности.

ent-ADTClosetLPathologist = шкаф снаряжения 3-го уровня биологической опасности
.suffix = Пустой, Патологоанатом
.desc = Это хранилище для снаряжения 3-го уровня биологической опасности.

ent-ADTClosetLPathologistFilled = шкаф снаряжения 3-го уровня биологической опасности
.suffix = Заполненный, Патологоанатом
.desc = Это хранилище для снаряжения 3-го уровня биологической опасности.
8 changes: 8 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,8 @@
ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоанатома
.desc = Большой вещмешок для хранения инструментов и бумаг.

ent-ADTClothingBackpackPathologist = рюкзак патологоанатома
.desc = Рюкзак для хранения инструментов и бумаг.

ent-ADTClothingBackpackSatchelPathologist = сумка патологоанатома
.desc = Сумка для хранения инструментов и бумаг.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingHeadHatHoodBioPathologist = { ent-ClothingHeadHatHoodBioGeneral }
.desc = Капюшон для патологоанатома, защищающий голову и лицо от биологического заражения.
15 changes: 15 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ent-ADTClothingUniformPathologistSuit = костюм патологоанатома
.desc = Лёгкий комбинезон для работника морга.
.suffix = { "" }

ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома
.desc = Лёгкий комбинезон для работника морга. Более угрюмая версия.
.suffix = { "" }

ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома
.desc = Лёгкая юбка-комбинезон для работницы морга.
.suffix = { "" }

ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома
.desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия.
.suffix = { "" }
8 changes: 8 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-ADTClothingOuterApronPathologist = фартук патологоанатома
.desc = Фартук для работы с трупами.

ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома
.desc = { ent-ClothingOuterCoatLab.desc }

ent-ADTClothingOuterBioPathologist = защитный костюм патологоанатома
.desc = Костюм, защищающий от биологического заражения во время работы с трупами.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTSpawnPointJobBase = патологоанатом
.desc = { ent-SpawnPointJobBase.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 = От него веет прохладой.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTPathologistIDCard = ID карта патологоанатома
.desc = { ent-IDCardStandard.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 = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/Job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-name-ADTPathologist = Патологоанатом
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTVendingMachinePatholoDrobe = ПатологоШкаф
.desc = Самая стильная одежда в самом отдалёном месте медицинского отдела.
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ job-name-ertjanitor = уборщик ОБР
job-name-boxer = боксёр
job-name-zookeeper = зоотехник
job-name-visitor = посетитель

# Role timers - Make these alphabetical or I cut you
JobAtmosphericTechnician = атмосферный техник
JobBartender = бармен
Expand Down Expand Up @@ -94,4 +95,4 @@ JobTechnicalAssistant = технический ассистент
JobWarden = смотритель
JobVisitor = посетитель
JobBoxer = боксёр
JobZookeeper = зоотехник
JobZookeeper = зоотехник
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ ent-SpawnPointReporter = репортёр
ent-SpawnPointPsychologist = психолог
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointZookeeper = зоотехник
.desc = { ent-SpawnPointJobBase.desc }
.desc = { ent-SpawnPointJobBase.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ ent-SeniorOfficerIDCard = ID карта инструктора СБ
.desc = { ent-SecurityIDCard.desc }
ent-UniversalIDCard = универсальная ID карта
.desc = ID карта, которая позволит вам осуществить свои самые сокровенные желания.
.suffix = Админ
.suffix = Админ
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: BodyBag_Folded
# - 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: BodyBag_Folded
#- id: ADTFootTag Разкоментить после добавления слота для носков
- id: SpaceCash500
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: BodyBag_Folded
# - id: ADTFootTag Разкоментить после добавления слота для носков
- id: SpaceCash500
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#- type: entity
# parent: ADTClosetLPathologist
# id: ADTClosetLPathologistFilled
# suffix: Filled, Pathologist
# components:
# - type: StorageFill
# contents:
# - id: ADTClothingOuterBioPathologist
# - id: ADTClothingHeadHatHoodBioPathologist

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#- type: advertisementsPack
# id: PatholodrobeAds
# advertisements:
# - advertisement-patholog-1
# - advertisement-patholog-2
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
21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

- 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/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: ClothingHeadHatHoodBioGeneral
id: ADTClothingHeadHatHoodBioPathologist
name: bio hood
suffix: pathologist
description: An hood for pathologists that protects the head and face from biological contaminants.
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hats/hood_pathologist.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/hood_pathologist.rsi
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingOuterBioGeneral
id: ADTClothingOuterBioPathologist
name: pathologist's bio suit
description: A suit that protects against biological contamination while working with dead bodies.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi
11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Entities/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/Entities/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/Entities/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/Entities/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
22 changes: 22 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- 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
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- 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"
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
Loading
Loading