From e7bf9d8033bb851586b5b2cf12538b5a8d14ed56 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 30 Jun 2024 01:50:43 +0300 Subject: [PATCH 01/75] =?UTF-8?q?=D1=80=D0=BE=D0=BB=D1=8C=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D0=BB=D0=BE=D0=B3=D0=B0,=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/prototypes/spawners/jobs.ftl | 2 ++ .../Locale/ru-RU/job/job-description.ftl | 2 ++ Resources/Locale/ru-RU/job/job-names.ftl | 5 +++ .../entities/markers/spawners/jobs.ftl | 3 ++ .../entities/objects/devices/pda.ftl | 3 ++ .../objects/misc/identification_cards.ftl | 3 ++ .../ADT/Roles/Jobs/Medical/pathologist.yml | 33 +++++++++++++++++++ 7 files changed, 51 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl create mode 100644 Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml diff --git a/Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl new file mode 100644 index 00000000000..49d25c8db05 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl @@ -0,0 +1,2 @@ +ent-SpawnPointADTPathologist = патологоанатом + .desc = { ent-MarkerBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index a2deba9868e..8acc492b758 100644 --- a/Resources/Locale/ru-RU/job/job-description.ftl +++ b/Resources/Locale/ru-RU/job/job-description.ftl @@ -46,3 +46,5 @@ job-description-serviceworker = Изучите основы барменског job-description-visitor = Наслаждайтесь своим визитом на станцию. job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключённые были оформлены и выпущены по окончании срока. job-description-zookeeper = Устройте весёлое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite. +# ADT +job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 35d1660add6..adb3317a54f 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -46,6 +46,9 @@ job-name-ertjanitor = уборщик ОБР job-name-boxer = боксёр job-name-zookeeper = зоотехник job-name-visitor = посетитель +# ADT +job-name-ADTPathologist = Патологоанатом + # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = атмосферный техник JobBartender = бармен @@ -95,3 +98,5 @@ JobWarden = смотритель JobVisitor = посетитель JobBoxer = боксёр JobZookeeper = зоотехник +# ADT +JobADTPathologist = Патологоанатом \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index b0d047898f2..9b89128a8fb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -97,3 +97,6 @@ ent-SpawnPointPsychologist = психолог .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointZookeeper = зоотехник .desc = { ent-SpawnPointJobBase.desc } +# ADT +ent-SpawnPointADTPathologist = патологоанатом + .desc = { ent-ADTSpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 444ff5b7dfb..33937ea030d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -85,6 +85,9 @@ ent-ClearPDA = прозрачный КПК ent-SyndiPDA = кроваво-красный КПК .suffix = КПК Синдиката, Ядерный Оперативник .desc = Смотря на этот КПК, ваше сердцебиение учащается... словно его владелец совершил нечто ужасное. +# ADT +ent-ADTPathologistPDA = КПК патологоанатома + .desc = От него веет прохладой. # Corvax-HiddenDesc-End diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index c2138981066..2aa125d31ae 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -126,3 +126,6 @@ ent-SeniorOfficerIDCard = ID карта инструктора СБ ent-UniversalIDCard = универсальная ID карта .desc = ID карта, которая позволит вам осуществить свои самые сокровенные желания. .suffix = Админ +# ADT +ent-ADTPathologistIDCard = ID карта патологоанатома + .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml new file mode 100644 index 00000000000..098a62b2934 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml @@ -0,0 +1,33 @@ +- type: job + id: ADTPathologist + name: job-name-ADTPathologist + description: job-description-ADTPathologist + playTimeTracker: JobADTPathologist + requirements: + - !type:DepartmentTimeRequirement + department: Medical + time: 21600 #6 hrs + startingGear: ADTPathologistGear + icon: "JobIconADTPathologist" + supervisors: job-supervisors-cmo + canBeAntag: true + access: + - Medical + - Maintenance + +- type: startingGear + id: ADTPathologistGear + equipment: + jumpsuit: ADTClothingUniformPathologistSuit + back: ADTClothingBackpackPathologistFilled + shoes: ClothingShoesColorWhite + id: ADTPathologistPDA + ears: ClothingHeadsetMedical + belt: BoxFolderClipboard + underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + socks: ClothingUnderwearSocksNormal + underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear + underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + innerClothingSkirt: ADTClothingUniformPathologistSkirt + satchel: ADTClothingBackpackSatchelPathologistFilled + duffelbag: ADTClothingBackpackDuffelPathologistFilled \ No newline at end of file From 897ad1b5e09c4686d9b6f5e93b60e49b060d811f Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 30 Jun 2024 02:04:43 +0300 Subject: [PATCH 02/75] =?UTF-8?q?=D1=81=D0=BF=D0=B0=D0=B2=D0=BD,=20=D0=BD?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=89=D0=B5=D0=B9=20=D0=BF=D0=B0=D1=82=D0=BE=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0,=20=D0=B0=D0=B9=D0=B4=D0=B8,=D1=82=D0=B0=D0=B9=D0=BC=20?= =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=BA=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Markers/Spawners/job.yml | 11 ++++ .../ADT/Entities/Objects/Device/pda.yml | 12 ++++ .../Objects/Misc/identification_cards.yml | 12 ++++ .../Objects/Specific/Medical/misc.yml | 64 +++++++++++++++++++ .../Prototypes/ADT/Guidebook/medical.yml | 4 ++ .../ADT/Roles/play_time_trackers.yml | 2 + .../Prototypes/ADT/StatusEffects/job.yml | 6 ++ 7 files changed, 111 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml create mode 100644 Resources/Prototypes/ADT/Guidebook/medical.yml create mode 100644 Resources/Prototypes/ADT/Roles/play_time_trackers.yml create mode 100644 Resources/Prototypes/ADT/StatusEffects/job.yml diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml new file mode 100644 index 00000000000..b5bba07e35e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml @@ -0,0 +1,11 @@ +- type: entity + id: SpawnPointADTPathologist + parent: ADTSpawnPointJobBase + name: pathologist + components: + - type: SpawnPoint + job_id: ADTPathologist + - type: Sprite + layers: + - state: green + - state: pathologist \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml new file mode 100644 index 00000000000..d2bb10dab7d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml @@ -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" \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml new file mode 100644 index 00000000000..d35ebc5245a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml new file mode 100644 index 00000000000..dd4bd9a5b4c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml @@ -0,0 +1,64 @@ +- type: entity + name: foot tag + parent: BaseItem + id: ADTFootTag + description: A piece of paper for dead. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/foot_tag + layers: + - state: paper + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + visible: false + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/foot_tag + slots: [socks] + quickEquip: false + - type: Paper + - type: ActivatableUI + key: enum.PaperUiKey.Key + closeOnHandDeselect: false + - type: UserInterface + interfaces: + - key: enum.PaperUiKey.Key + type: PaperBoundUserInterface + - type: Item + size: Tiny + - type: Tag + tags: + - Document + - Trash + - socks + - type: Appearance + - type: PaperVisuals + - type: GuideHelp + guides: + - ADTPathologist + +- type: entity + name: box of foot tags + parent: BoxCardboard + id: ADTFootTagBox + description: It's plastic a box with foot tags inside. + components: + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,1 + - type: StorageFill + contents: + - id: ADTFootTag + amount: 6 + - type: Sprite + sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi + state: icon + - type: Item + sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi + size: Normal + - type: PhysicalComposition + materialComposition: + Cardboard: 50 + - type: GuideHelp + guides: + - ADTPathologist \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Guidebook/medical.yml b/Resources/Prototypes/ADT/Guidebook/medical.yml new file mode 100644 index 00000000000..6c9ee41de41 --- /dev/null +++ b/Resources/Prototypes/ADT/Guidebook/medical.yml @@ -0,0 +1,4 @@ +- type: guideEntry + id: ADTPathologist + name: guide-pathologist-ADT + text: "/ServerInfo/ADT/Pathologist.xml" \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..ed8123ead80 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobADTPathologist \ No newline at end of file diff --git a/Resources/Prototypes/ADT/StatusEffects/job.yml b/Resources/Prototypes/ADT/StatusEffects/job.yml new file mode 100644 index 00000000000..6949938344a --- /dev/null +++ b/Resources/Prototypes/ADT/StatusEffects/job.yml @@ -0,0 +1,6 @@ +- type: statusIcon + parent: JobIcon + id: JobIconADTPathologist + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: ADTPathologist \ No newline at end of file From 59b0cc01382d90f33619f27836867f688854b814 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 30 Jun 2024 02:13:06 +0300 Subject: [PATCH 03/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20guidbook'a=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Entities/Objects/Specific/Medical/morgue.yml | 6 ++++++ Resources/Prototypes/Entities/Structures/Storage/morgue.yml | 3 +++ Resources/Prototypes/Guidebook/medical.yml | 1 + 3 files changed, 10 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 06566214651..00c043aa628 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -87,6 +87,9 @@ paper_label: !type:ContainerSlot - type: StaticPrice price: 50 + - type: GuideHelp + guides: + - ADTPathologist - type: entity id: BodyBagFolded @@ -101,6 +104,9 @@ # - type: Placeable # prototype: someId # snap: Center + - type: GuideHelp + guides: + - ADTPathologist - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index 496ea416119..f81966ce9fc 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -73,6 +73,9 @@ - type: AntiRottingContainer - type: StaticPrice price: 200 + - type: GuideHelp + guides: + - ADTPathologist - type: entity id: Crematorium diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml index 0c7b1c781e4..0951fa1ec44 100644 --- a/Resources/Prototypes/Guidebook/medical.yml +++ b/Resources/Prototypes/Guidebook/medical.yml @@ -7,6 +7,7 @@ - Chemist - Cloning - Cryogenics + - ADTPathologist - type: guideEntry id: Medical Doctor From 09687df28ecedda8642b47456a4db36e9a175fb3 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 30 Jun 2024 23:37:07 +0300 Subject: [PATCH 04/75] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=8F=D0=BC?= =?UTF-8?q?=D0=BB=D0=B0=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/entities/markers/spawners/jobs.ftl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 9b89128a8fb..c030ef4e119 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -96,7 +96,4 @@ ent-SpawnPointReporter = репортёр ent-SpawnPointPsychologist = психолог .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointZookeeper = зоотехник - .desc = { ent-SpawnPointJobBase.desc } -# ADT -ent-SpawnPointADTPathologist = патологоанатом - .desc = { ent-ADTSpawnPointJobBase.desc } \ No newline at end of file + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file From 378a1c07941d6a641d241c3b1c90e0ffc81097a5 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 00:00:05 +0300 Subject: [PATCH 05/75] =?UTF-8?q?=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=8F=D0=BC?= =?UTF-8?q?=D0=BB=D0=B0=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/entities/markers/spawners/jobs.ftl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index c030ef4e119..375b56af253 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -96,4 +96,7 @@ ent-SpawnPointReporter = репортёр ent-SpawnPointPsychologist = психолог .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointZookeeper = зоотехник + .desc = { ent-SpawnPointJobBase.desc } +# ADT +ent-SpawnPointADTPathologist = патологоанатом .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file From 19af4fc673501da67f32385be95937da3aa2d203 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 01:34:23 +0300 Subject: [PATCH 06/75] =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=BC=D0=B5=D1=88?= =?UTF-8?q?=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Back/Backpack.ftl | 2 ++ .../fills/backpacks/startegear/duffelbag.ftl | 2 ++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 11 ++++++++ .../ADT/Entities/Clothing/Back/backpacks.yml | 7 +++++ .../equipped-BACKPACK.png | Bin 0 -> 1005 bytes .../Back/pathologist_duffel.rsi/icon.png | Bin 0 -> 537 bytes .../pathologist_duffel.rsi/inhand-left.png | Bin 0 -> 615 bytes .../pathologist_duffel.rsi/inhand-right.png | Bin 0 -> 622 bytes .../Back/pathologist_duffel.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 48 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/duffelbag.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl new file mode 100644 index 00000000000..1a308ef156a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоанатома + .desc = Большой вещмешок для хранения инструментов и бумаг. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/duffelbag.ftl new file mode 100644 index 00000000000..84250cd8a2d --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/duffelbag.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBackpackDuffelPathologistFilled = { ent-ADTClothingBackpackDuffelPathologist } + .desc = { ent-ADTClothingBackpackDuffelPathologist.desc } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml new file mode 100644 index 00000000000..45168480281 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml new file mode 100644 index 00000000000..31c5b891082 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -0,0 +1,7 @@ + +- type: entity + parent: ClothingBackpackDuffelMedical + id: ADTClothingBackpackDuffelPathologist + components: + - type: Sprite + sprite: ADT/Clothing/Back/pathologist_duffel.rsi \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..2e5790934ed92664b84e56bfa01177a7036ea5a7 GIT binary patch literal 1005 zcmV;-v~kx+sxA zyY^48M6n)?i770x$d-^p3`oJ(gS=&Hvm1BQ-6);UE#YN$b~5wk@#YH<1VIo4K@dbm znp+20TlW~NwI7^NFv?*OQ`7GQ|-qf@V9*p>y zqooBRG2_mm)HvJz71oFQ8dGY+(MkFoj|H?m*f znfiS-sB2$XPhhL=5&&>6%UB#5hHt`a$R|@7P|H$SJvmY~J^L0W_6L{_O)Sq}U0*~8;Ojg3v=p23~Vut;w+HoF)i+mQPqJ+Yaq$RgWWyMFGTDQ0B{wAQt@ghwkiP0{X@pn9sn{~3Et%uG&-F) zmu1Kw-kW-^p@WbXr^j*2OF+H5^PVpT{O~TXfaMFO?f&yN7z#!$*%%LY_mE2GkV@y2 zmInZfL&K(OpJRI)s|Ft2zQKOwJF~UVxl;k)sI#n^mnR5`<>(K$WCI>NIoxqry68{%payMu5O6$n?2bcAP_ zb9zR1y>5E&SsZXRivB(~``7wfPKveY2+uM;FlG6I?%Y7L1Y&~7mL`1=1Aef4L7Bi_ z=eCF@)SSyQSiS%;;K$OWPqz#-18}grr_|C;B#gzOVQaj#fW@I<>_o!KK5($Rr@6Ll z0Ahm3)B^`@=r(YZOjGLzfUDt&Ru<@X0bxB+mHx&GjFej@D?wOK=&mUn0G={yg)>Ee zlS=0_2cLHC1Er#*1fg6<2nC~z4^YR2ZLAf}06?=0Gj=&We0CeZ@&8-8h zp~+>-0f|4WoFKzFJ;T)gvU~wkoxPefL|te3LCCwj0-$nBxecgWw;1qOJPqm!BzW40 z0l)HHYSPDyDzWTBEu#UT9N+cO4Z!?D#BsguD;caM*L}N*cHl<;U}r%#l^+tpYc@F>EP&sL_+?G zx~!-e8;(}x>6rQ16*51&LjL;B4sKe*th28hGgs#zB@LUSV?tA_miJX`Ul^ZRR#Zen zeheO+;Imi+DQUP&E(k+JcXmxJZ)%uD>m0K}$a~vmeL8w4@pPLq+g)p0Wr6KN)UX0X zLVmQi1kB55KPINp(9{G^qqkyk00_4Cn>AW%c(7mwFrW>2Jl&@7rRVVWeCI5EuU=3JVe7G}Lwurj%xFany!1_kg+%DO42AzG~0ALzA zIgDs+Hl0E0@RX?&PJt0(U;6+lX_yGM3D<~KyS|b1c$<6vbVLIHeBl_Ws-p#Oa}V)_ zV@x06pUW4HkuUvsdufGxM}Ipyc)b)r{^i*DQOpWqJkw!#)Jp;L*=}&h0qnx?;0@~H b;zIKcU5fIKpWGCA00000NkvXXu0mjfH!k^K literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bea3102d2e83da4b02607b8d345c21deb177611b GIT binary patch literal 615 zcmV-t0+{`YP)=!DTBX{v@Z;TW06@Lb(%J-_T8j&>#W!HouC;71{!xj> z(`xhGyw)jDJUYYG`Qd-(469}16c7=Or$f(doofcUPKwx$M&oJq?{EK)>e!Q5;5)BV ztNrKq{e1U{h=_=Yh=_=Yh#oZQY(NkjSp*To=!zXV6{`M7TW*7MFW`~GK$c2>!?BsT?#@Q3QpY) z8hbi6ZOu@sNaeV}h?$;)+~cmjc(1)n-vz#(CCSU(d%yQP?jGFx0YpSZL_|bHL_~C6 zd!r*7^`_7rhl)nMDcT#I=&=S(cv6z!6&7`P$b}xmp1LSY|hIN!a`JMF8qCr@beas};O+eqbt_ zMX8X--8<6&fRvGuZ2;tF5?wat8>2c}c=8mpvky?dUk&{K+4J{NW4(4kF^^2ZaQFwi zyB}fgn_~@1H{UH_nOz9m!2m$3wT9#V2>{5p-qERim<;W{{GKG2joJ4A%N1*4Y5pEm zR)O`c&-iw@nWzUK@c&gnDdt?U7P{7}9FsJoVh+qku2>Vlf1Lz&bo179BCotx=Jt$l zvXc-q5fKp)5fKp)5mB<~su_r7@BgZF*9?qfETwnlx@rd83A)yjoFONBh9vRMoO*tRVU!-$-O zk=x@}5qHhNb<`llnt(|ZdJA}K26{)QvVGh&1D4sv(C+*C2Y|uZ8HDY~I)JD`?;)Kv z1Mb*Cs{nx5Rsy9!;y7kpV@IK!L7g=NZW6rXJKy)X-%m043u~!Ya8adyH~;_u07*qo IM6N<$f+EEoz5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json new file mode 100644 index 00000000000..880271d7b62 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 65c972e5e4183a515b12b7bb77e6b79a7e8b79e8 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 02:04:46 +0300 Subject: [PATCH 07/75] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B1=D0=B8=D0=BD?= =?UTF-8?q?=D0=B5=D0=B7=D0=BE=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl | 7 +++++ .../Entities/Clothing/Uniforms/Jumpsuit.yml | 21 ++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1449 bytes .../Jumpsuit/pathologist.rsi/icon.png | Bin 0 -> 455 bytes .../Jumpsuit/pathologist.rsi/inhand-left.png | Bin 0 -> 551 bytes .../Jumpsuit/pathologist.rsi/inhand-right.png | Bin 0 -> 576 bytes .../Jumpsuit/pathologist.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1302 bytes .../Jumpsuit/pathologist_alt.rsi/icon.png | Bin 0 -> 465 bytes .../pathologist_alt.rsi/inhand-left.png | Bin 0 -> 609 bytes .../pathologist_alt.rsi/inhand-right.png | Bin 0 -> 623 bytes .../Jumpsuit/pathologist_alt.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 80 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl new file mode 100644 index 00000000000..abfd49f237d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl @@ -0,0 +1,7 @@ +ent-ADTClothingUniformPathologistSuit = костюм патологоанатома + .desc = Лёгкий комбинезон для работника морга. + .suffix = { "" } + +ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома + .desc = Лёгкий комбинезон для работника морга. Более угрюмая версия. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml new file mode 100644 index 00000000000..da83626cc1e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -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 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a961e51f88781ae4fb57c42a4e50072e27e2a2a6 GIT binary patch literal 1449 zcmV;a1y=frP)p#x?=w|`;%i31oeXEh}9Y!k(W%zU@*f4kv$G4{VH)v3mW_dHa2!_Qx zK_9r|wmf+1X-DYKIA0j?2RmSe_GPjdy!@koQ~aR>-1O7m9uMQ}JC?sh&;1X7^Yyfg z1dUVQSdATm*V!Zc*aKG*`bYn!__fP)@&2c?$*CE)(L3t~7gyZm((QiM#XLY0UtZYJ ze&y7!u5)0~?VUaBuB@-QmG9oE#ZUlcx(@%Zw?EH^-2BWVo}`PvEITWH?F#s3(Dy+Q zeE;0(37xhC&L4o;k%OL`=_ijm+UZAsf@l0FQio5_;3#--V(@DT!03hZ-=j)Jgb;jD z>c$oO)|IR5FahAA%cN>tvF~KDA}s&8{Lzl(>(79#4muS5yLkJ6)E;F#tH5h_8Wk`eQE z4vnzywETU=F8>IhH&anKbYt*MTY%Ra;D8l{dfNLV?)#$Mu#9~~!KzJ@5`#bVEg+Dh z<`u*$K#yDWdKDom$M|6)KucY-%_)r&T9Rsyaiqx@?1O~{SNLIl6FXra(-x>=T3e#3 zJp}x}J)2j6W?M^NS~D}Q0EH_ZiyO59iZiXUbgVPO#>u|4`l~Fh`X<^$0BmQvutF?dW9q_Wc?6h2WeGQzgH zXVVIp`u6Hw0Ss=QJmta2%Zm^zc%5TaZNlJg0N9lAMH2d`x;kxI0etrAzV}U@_GTF( zni0y^u20m##m~y9{as&%1vKszu>Z)s8@zut zczhs7z=ez$F%b}cb>#!)=ITP8DhGUAD*!CrN$^`>%NHgG34QbxLw-yIT)u1H)@i@b zo804;yv6}-1?|rvm?Jfp;q7^J$*pf&&3YToEjNcS5m04Tfyd_PtL&E5SKSXN>)WKx z^p6nv`Mpz9J|`a2W zq?ij5rhkNR7za3M#XNN}z>JF(d;n8|FZkriQDsAICZK2+aBYiXTbpGt!%2w68kqo? z*Le`@M9erat?&FYoRJ9FjTtC&%2GF~4^aeg;Oz$cmO$(J;tM{-NE87A5((jfq_(!T zFy%ump6N9hf`p96oW7y0m}if<^-7Kzo5mytt}*a0=3G4p)x+_100000NkvXXu0mjf Dkn_ea literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..35ff4730355de87bc300e5cddb61293a880c4cb0 GIT binary patch literal 455 zcmV;&0XY7NP)ybI*yhS8s?!iqdi| zjm5WjSguWYxNn?q%(QsX^RQf-*DwU&H4L#_o1*98)f+M-#pnXnon4Vg;Z(}_t1H0w z$pQS;6`V>Li4@hHT_cH10$#l#PNfV$FX*O4OUt!XM#r5>*{Bnl1ST#5RQn#wwFipn z4m=&417Nu}s(sJIMUb_AHi0DW@bT6gi1mVQS`a`TodNLi)+32Ke=DGZOY5b3g+wYH zJ^+anvNl5!cd)nDkx22UaX-*^C`P!yTx(n$%d?t$V>F;h7rX1d*2OjTEjB*xCUQXf;nJKGq%?^K?GKWAmHd9zHYG{9}O#cJ5;S{`EnfW5N~t6}Flv_5BL<;|KH z$8}|CWknppoC`tpgWIH$_8l8Bb1Wn pJVGfyHEYfgl@~002ovPDHLkV1mbn_Uixu literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a2b4e3412b54966f2d11f7c7638f5aee77abdf3d GIT binary patch literal 576 zcmV-G0>Axl=9MO)DiVMPY?N z4koZ+X~pvOU^j&9td8r7nezW#!p|9m8K$p;V-5fKp)5fKp)0IcsHNPSF&k?6*o zVxG*eW=-S;zV-qy@U=I3Y4c{DDu4>3a-!-*DvYGNwNXx}!l*GtcuMBw`at`#g{#wZ ztbKeBFYtl=11aJGx?3BV+~n%?9PP{2GcD)wo|1X00HgE_os&MY)m3F%++K4|0-<(R2YfVbIadyodW>e zy@syIoqhtC0<3bLPj-@)jsNjoI%{J?(yH5L9xWTrp z_#d$R#>4OH3oLb9{2AwH_1@z4SB6n~*0|ST-po^*AW*(9(&_dwE{4blUmQ2s765m@ z8@71B&dfwaL_|bHL_|bH&1PfIz(cfOhIDM~88Bf~02_M-Old!i)Y;fGV9KZfHuemd zGAe+LJp-nUH$fYF222U;PCr(0#?1mSyAs O0000UP) zzTbtWtRZof%v5Tf*fU}@ZBsCXN+NKaiM25h@&s%p5l5B0IkCo%n=g+5EUOJO;}$f zuKowIM)-ag?z>}6%OffB_kh8UwR6NE?+PV{tX;YiL|GHxC)8TLpjwcplNv??uOBIy(dOU z1925-9kzHo{V8-_2B|3^K71(X$ZGD3&_Gj%(;j%v>e^P&ZnuN&9XojN@M!=54<0@Z zws-8H-EIe~Yg>tgzgg-_&6i?nn!gvgo`<^qCKuHvYlMtGy%&V_bzM*VCF}&NYg>G@ z!~ekcj(u@FKnyy>;3NwVNLpWN6*w&j0g%Z9F%5mG0iZQD{H~pL2>f5sS11$;g+ifF zC=?f*Vre=^D*2fNW7cF)EKSF;PcW@|Mq&qcF*BcnY4f_8*_zZ=NfAhjtPwJknw zStu9=G%cT4N_>zFv;jiev?*$in9?>RvMsLbI&VL4&Xy1zM8CX1oUM5&5BToI_xyN% zz5>_tdWt5p*q#<^680SjuIFKXz7lEUFi3eot=`1S*WaL4Z=zPUd7gm&k*K6)(i98> z>+8?qG+iuz^_XX-@7`O+RB;rwdQ<9tQUfqm97S=$L~+9GY0ugNW@oS9?!9H+c`AsA zgR}?mv`GP5YE!3ofSUKh9qheVvSfhC!cnid=ylr9g$-0onUVtpZ_a=@BcovVt_v`u-6+5)`Ap^T^Fpbx78_ivJt`0OecvfG)v)$p8QV M07*qoM6N<$g8uSzasU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3c088b5e8f3ef1787babf5f7cf242f546975714c GIT binary patch literal 465 zcmV;?0WSWDP)qT%Y5wsBGxYq9=!XcOixou>G z>>vojv(PN7h|B~#^Q$J0y!Zah{O1jHbaZrlcUIaa#%U_e`u^^&b)D7F1f3UBJIi{e zm%|dNglY9JSV&NU&I^h9ed_rffREOpB7XS(XiO=!vnZt)WElXrvnc?BEJG!i$0(4%8QVIa)+@k4vrWazGxKaw87v3Vg1nljPan2E` z$G-jj1l(L#937v$i8X@82ZsP`Z2kn`==g-2>&jbzH^b3H;xrYV7h+5)#*`ALsTfnr za5NE}7ZRtb3`dh74+J^3x%k%gjk53P5ZSQja=Pz5^yF5NU z5GM(1y*WZA-m^?Xj$?*lLH|390x8b;m>M-#Eu%H>rhr)L+U^FmI~F68p6 z5^HVn`9lj2ERW#Z*_8L+p&kf&3to%Ae}ul|QR?XE_`W;?(e<&;|8-1R00000NkvXX Hu0mjfgmBiT literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2e179b2bf02b895cdccaf4042699c62d53912439 GIT binary patch literal 609 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVAAk(aSW-L^Y+%ptlI%1Y!B}H zdRlqN^|0=eoZ@rSWJ}a9gJanXy%iQZ9}lupYdh1}V&lN2c++cPWs}ZH5s##%_1z|s zS)DHmtR*CO&WP&ri*@;zZ#eDD`Hwrpr#Z4KC_%xZ;~)MW*m25ubKn2-Ybxh?w*06| z&^bM;^4z91L9O0tqJcXZ*L_lBwa#V#IrVhcRvqrmVPE3YM8EFII&k$VYuvu7-q58J zqAee9nS1hgnFVezvbQgP@%F8&$#j43e~!PkEe2eL z#kJjU*XAY1T?_awo%zdP>Qv83EQumYzVbjDc1F5(vhF-(?01`yq34l=@9ksl{qT zbKj}$tNGjJS1t_Xc%Od!x&P#^iN}K1r*7^NxXpO8|Efc_Nv`x_i({*TCTDLy!#Ckn z)QY)xm5XbN?0&L8*E%mVf6nZ=cNbs!o)cb~mRp;wrTu?i2OP|kS}DmikzKi4&C)qw zH=D1?hKNW$2E)YWq0Q0{6J@Q`1qsB^v8os$5;GEr4?raZTUDt{omv){ zkoY5%qq3DDHWgNf>rmOfBzCx@MA*{vTcTWYuity)_=bA{A|fIpA|fIpA_4%jSeBJ}q31Sf&O-%ogqsG^Cpp4Z_4#@l&=GE7its-<4;A42 z>=Yd-(@CD!P)VTVA{{Ales(&IwM?WwUpLA*DTZ#S0K0ofXm9TzilQ`N66pB&6QU?W zdwU1Fdq>k;(^&k#2Y}3+_3`9;x}gHBt+pzc7gz8Dzi;CD`;U-6d+-Avmls!9TWwXQ zvz+nW$(u?XKlJ6Ch@uF7;3JM7a3^nua?V|Z{{QKPA*!~G4;yW~d)v$mR0Mj?IzRAp zbIu%egsbM}UZQH-X#l+#dDVPQgE{L)<(#<<#=n1IW)`@W*J!p@@cGMEG+QgUmDiY= z{rh>*=sDlVVc+YhoOADh?wqFAT9DMEaj9;vMj$Id5+5tAoQ6mF%64aMi)# ziQ3%SFUGhoW- zq@>&Js#mYyU_l4~|4v*7&)_Ou&j8VAe*k0zi1D%3k6Zu%002ov JPDHLkV1i5LA~*m5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json new file mode 100644 index 00000000000..92e0986e8f4 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/pathologist_alt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} From e45c48f8affafd77233b628999156d74fe2e49ce Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 02:15:42 +0300 Subject: [PATCH 08/75] =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=B1=D0=B8=D0=BD=D0=B5=D0=B7=D0=BE?= =?UTF-8?q?=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl | 8 ++++++ .../Entities/Clothing/Uniforms/Jumpskirt.yml | 21 ++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1280 bytes .../Jumpskirt/pathologist.rsi/icon.png | Bin 0 -> 516 bytes .../Jumpskirt/pathologist.rsi/inhand-left.png | Bin 0 -> 562 bytes .../pathologist.rsi/inhand-right.png | Bin 0 -> 589 bytes .../Jumpskirt/pathologist.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1191 bytes .../Jumpskirt/pathologist_alt.rsi/icon.png | Bin 0 -> 499 bytes .../pathologist_alt.rsi/inhand-left.png | Bin 0 -> 560 bytes .../pathologist_alt.rsi/inhand-right.png | Bin 0 -> 578 bytes .../Jumpskirt/pathologist_alt.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 81 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl index abfd49f237d..fcd8072a89c 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniforms/jumpsuits.ftl @@ -4,4 +4,12 @@ ent-ADTClothingUniformPathologistSuit = костюм патологоанато ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома .desc = Лёгкий комбинезон для работника морга. Более угрюмая версия. + .suffix = { "" } + +ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома + .desc = Лёгкая юбка-комбинезон для работницы морга. + .suffix = { "" } + +ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома + .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. .suffix = { "" } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml new file mode 100644 index 00000000000..98dd024ec2d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -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 \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..c391e98c1b752f56a17bf4e72a9cf315a1a9fa6a GIT binary patch literal 1280 zcmV+b1^@bqP)FoO(qxz!Fr6mG@|@o_XS{j5_j2!xH!8gcX3o1`=YP)sop;|b z=ZZv$3`7PZ1CfEqKx7~?5E=M?GSKA{_Qs>flYgeBB&j#0_T5*Vwf%ecC0%{JvU*@Z zZl6Bh>G!eiGFS1Liw`PbBW3WNodvu)xK0}PCIu1{Or4^w;~_{;d<_~uRKQiC-v{4` zfPoJWChOnarWi)wxp>9g1=!CTn>zQolkEjYa~fIrOeI)5cwLTfuJ|wMqC8D{b9WI8 zEAs@s=JidT;OS=^VLt0jV~Jnb0n4_pCey*If6RBqUzC7XuKsKAFwS#F`m5-5^Xr?Y zpK&EY*Xi7{8ao89dym@39=IyDf6RBqFHF;+9S4%`o~q2&Z%J!M{h`F&5*3@8B}=d-Tr9cW>1)3z_kilz;#o`w5ya} z4Bs|d7Jos2w!y6HYJY!H?dy|Pt0jjIoseC--;p1_|5ZNy?3h$46=~G#(x}zEY-Zu) z_1XB~;fJlu;5$3pJNQ<@=Js->*F4*KTK9{*Aj*buC&LNn)(JH z^%V+#(M=FPcpdRtV`Jf!m?iWx&OGL4%_-X#65lBU2#h=AzVjw%B5Z%XwrOudkZBN0v*gk4sk@m^}{`Rh&|GiW8CJhn2 zBeb6!pD2PYKL!TDQ-7GdFkvdhlw}`$dr@lhWji11UIb_zK+9qZwA>l6dgp+&zI+@! zKJb@36{#}fMSy+af!e^_)S%e_6?nNa06aaDU>T=aNY#f(dVH) q|2+7hd_)}?hzvvqA_Ffn1CIbJHB9Cd^be*000002Xqi_6^EN|cXk!$b}d*6orDhEy69SPDwJ{* z!GK3ElKj9JTj=pR97*qRFu!YuLi1T(^7#GU`@Z-4y&qImR8;)$7}IWiy1OU&_szRE zQ^(QX=ybXwv7)gS6u$IJ55qQzUcJzc_e3}OyyIZlCU;Q;z+Dt!*e3IigVX8CBO#_2 zuzYYR5-Tjv#ot^9MwJ8jo9kGfi^PiMgF`J5r35&gu2`N6K++!+NgHcHAtv`*o~zY~ zQUYoh_ayxRhHXwH%RBJxCy`tVpiTx$d2oo(8S4$!9-5ig6?!RsAP# z!lNwszC2r9l?C6IqvI3#^!ZYbj!$IVuNzZKt?6w^y|Kugy~2<9@`26L5Y_*v6|?j^ z&S$H+6Y@6>Yu0000fK;%ZwK+p zHCw8>y&2y>^=?ppEX_4bSMCOkf-6)m>Ihd?VS8>|sO`BJp4~$otYGQF$0!=)$^wAU z545v%xzbwFmdh3?~d=?w^?=U<)N2OZFTfdC=Xz=;J3|SMQA0X=AX=mvYIRujh zg?@lS&4SfF#Q1Ba(iA+MmAt0S(jn3Sr`b}4nib!x=OF;VY9FFdvr-*e(^*Mrv*yNj z9JR5vrEJGh-QyE=efyxg$0sWJJWJM3SIOE%wv*-Us}*+_#bq0>&krco*5m8@ONdc$ zrM-0}vvlM>1cCUyRF!HS<7j}ziWR^AaE3s@2mIlE>Ofw|*8l(j07*qoM6N<$g1P4a AlK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce111b95287d08a24d73c196daac4d3b1987f80 GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=s0kaSW-L^Y+$xug4BD>>u*O zr{{UMF6n7(Xf1WL)!A)+-manD#^HmhO||HKC;fd5`47&{u8(kv6wzWSGH7jEq;y8k zL{TMp?zL0rPJA!s^qqXNyiTQfro4j-3^07CE%y&Q->EQV)#qh1R6kGmWZt=N`JRJc zZJ##(+a76rolBuE$DDe~O0H{cm|)ec;`^ zGmGr3q_a=R7gg7_Ui1Cjyv%s-_mp*_2~%Pg)ZTL5wTI{W_b$em`-eaL(0_7GXy3eJ z5~$r7jG#$)M-F)CWcR#bJgXVqXnytQ>b=KAe2zP_S9WzH}fjhZFzgi;#YQ0vmgGL zU3Bty>(P8Yxp(U>zF8-BeEDyY#ZM0HIG=Fs%vM(cjeX)b-+eJS#}<)cee}D%Sq|fw zv$K9)?X>up_I9gb;ipuyG&Lm{aK3rN_=DKfa}&CHZJDjMa3v(4Z_s;s%wsB$y9>%) z%XH(0@dEE^!7Urp9oownbKXeK(3Y-dE6Lcu&FmY`iwjXKjlcd`Gdu`vTa^phM zx>*#99NQ{omz=2Md`8b{yuJIHIlHqK^R08{ogeQ!&-a<{nR(C5YfQ4FKvEznkQ7J? zBn6TJNrC@Ufrb#b*RS7D`7|+M%H^--ed%@W-eqkoD~*j!W^qf486JLAD-Y@0r>*d5 z3kMn4SUvdOWC3q(ZZ?yXlLiq4CQ{^8A43G;%V~JXz?D%Rg6}0jd&la^^0qc%*z{eg zWJdw@^Xf)lJ@e}Omrke1KU-Sc(+rPTZIxl{-_r?FM0R5*gSUfuCcSrckbUiqD*_Kl;5p^!4@HQJ3-n4GrBgrLj+DGw9*kcY0WU|#%;=kO>-@n3 z+Z#07;y51wySg@8=Z_rTZ>XmoVo8)5%Q`NK@NpW^lIEE&eo%O7Vv*zg=G|+ExX%Z9#HLdQK6sjx-M%zOgyR1;0$h;t zw=ZT5unG=En9clC637lA(()a9zA}-t`?Ur zp0(v6kE5=mdDk)Vy##Q>4~HcL%N=VzsT{9&GRkvYWij!+1b~Q0=&@8I@1}Yhi#Z3( zG`_b08V&xKFwtd=<;nLCNcP^4{GY}T;hNee1(E_ufuulEASsX(ND3qck^)JAq(D+2 zDew;|z@`K{M03R@xWK6%J_|x`0!-Ud)m@+(XsqqIk@1Gk%SeU}a5P^b#Xm zKUF>`04e-6vuyxkSksmc9~{FU{}yZkg2vx<(JT2u}ccEun+?xVtIFv`V_n>L{p0RA*@0` z^x!Ta*n|}}k3b+W7P89*g3O$Sh5KvX>|@@W|IWNO13f)GJ^wpbmJN)Jan1PW@$u4m zu7w6c#H57Fy5JaSkKo}Qk6#xM9W#PAor*j)es002ovPDHLkV1m2c>Sq7| literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2c0cb120d3df05b7648a9e30108ce92de41bf292 GIT binary patch literal 560 zcmV-00?+-4P)Yk6b103f;xP4vXCsXg1B{Za`Gi~D@Ab-Tnf7S1`dKlQE~Jg6x4#FlQ;^6wjxGJ zacH9$9O6(~QwcPGu8|MUZwWMTdV50BLN7o>L_|bHL_|bHNfe7qzF}H^*z5n9HOja| zNU^x&E2TouDWzf!E}0cY>H-YY8VsDD%_Df_`ok)v5OziXGApXo1)N`8;@P$V^oHvX z9=wvzwvF?P%S^MPN?kzh`W6R=r*K^tz|Y`HDO8V6;JPjj4o^|LzD<<{AXZjXsSDWM zDUUVkO*n05Fu2opu)4O1M(Y($+d-q=#O_XcEJ;@I!^g>rN-W4QEk8e-2LN=sUCiWi zSl_5%e}4}z_G7H~31%s!hKh}wHHt`>VOsvw)HG&tIRL#ugJpQ$XXL?uXZ6cWk`;x> z*P!?Hfr&}r$!?)kuHdS6gHpMIC%c7-$=>-SS?^vK9rq3IUN=!zW(?Ev@9rP`<>eKB zuCO?Cyt{u0{ZW%eRurPofa>uX8ucdT7Yc*p_Ess;Ge9b96w$D-tCMtK$t)rwA|fIp zA|fIp?Mdwri2N~=^X;?3Xt4K05mK>avuQ@{%b5tQu_#679hEg ypxrG1$nGO(Npgok%Ub}D+ab`l0DwCLBEA9FR-X8dCAE_P0000yKTT?nk`L_G{&HW>^YwDsq3OhtfzDiqg@D+6}zVGO$Yhl&7I3T0CW2f@bg}p@& z+rG1Tp4ggy+5F<8->3d>U$W%M$^W&NOq}H!I$(fdK}?)j^Y5JFqMQEiIx+d@=@m}X zQa$-M=y+Ex>Yrx*Iee-&_G$(I4!w_W5 zZ<>(4J1oQW_J`edF&EzdiirK)7xvuz&$|Aw&AoHqMkP+_KIJsca_5gNXOzV!?y0Z( zYnRsTx+ee1#_ij? Date: Mon, 1 Jul 2024 02:23:53 +0300 Subject: [PATCH 09/75] =?UTF-8?q?=D1=84=D0=B0=D1=80=D1=82=D1=83=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/outerclothing.ftl | 2 ++ .../Entities/Clothing/OuterClothing/misc.yml | 10 +++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 711 bytes .../Misc/apron_pathologist.rsi/icon.png | Bin 0 -> 318 bytes .../apron_pathologist.rsi/inhand-left.png | Bin 0 -> 375 bytes .../apron_pathologist.rsi/inhand-right.png | Bin 0 -> 388 bytes .../Misc/apron_pathologist.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 38 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl new file mode 100644 index 00000000000..16ac2d15dfa --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingOuterApronPathologist = фартук патологоанатома + .desc = Фартук для работы с трупами. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml new file mode 100644 index 00000000000..073f8768eda --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml @@ -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 \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..035c777987246dc75c02466deca3fa122c493967 GIT binary patch literal 711 zcmV;&0yzDNP)OQ;>~rK*(r=$;F>K>9#XZ7}ddxZViCcwwFVDL`HV3fCK9@cDh`lP~feDP9LzfHD&(@*U)-005AF$Wi1w zl$kIZfJuHzybg!*VO9K89mqevg?INGWhRiN2>?KBR-`_ugi$R0;S_J)%~0e!xZVhV ze%&KW6QkUu8lWb=->%^Uc>PVF1dydkCxvh_U&^1~zd9<%?CM(H-+poQ>y$o8OQ2c+ z2Yz^X1>?m-O=$UEpgK7<`PtRAJa+w3NDU_QrBov5s5)RWh(0mi1zrlI8jz(4{1exz zh448+527c}KcAsZxgbjL^+r^7&Vt`utlbjOI; zv}==5d73h2SS^9-Pv7-Mow!BxJhsb^B!HewY*vnPi~u;eM%qN>P^Z!QlA{VjKO59| zbYOa8=F_22-u!rYKXDjKtwGkiKrmh)OB0lt=)@{lUND z8%D9T*?Fu4@Q2fbQK>7cxr%%Te>k<;3fUoI)A*cYq%Eq3$R=DVRsx)JjI>3y&^F;p tvAz>jBG~qGDb;WMIa+cUhGCu*e*uxb literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..62551c1cb60a268308b23869aee2aeb8e43c602b GIT binary patch literal 318 zcmV-E0m1%>P)zT{Z^*}cG;}U_2slFpc9j-t+@*2@btzYMHl6Xw(!GAV z4?!dni9|%QeBUeezqnC1nB_*QPi`PFnN*+LKvS1L+MVV5zNyO~19NqQS#JE_4kps| zj?P&u#q|v&CS$%>k*;^&hb&gIut&avOVQ-8{g*fdbf9wm_tu-rf24Rw{7 z^05z}&%yceeGqqT1%N#k(wR~Ryl_*O7~u8^I?lMZ3J#)VU@U+D=~q1j$$-D-F|m)g zm!KR3Pr+139dK=h`DN`gh*vXUkHw6fe$0exD|rGy97E68(;Ffli9`TC0Z*$~{L<83 QSO5S307*qoM6N<$f*JFP(f|Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5b73a5e4a3631e9360262a858501e80a9e2f47b6 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^jeaSW-L^Y+$8ufq-!>>u{4 zCD*;(w@8^{rTPLjD;2FfvkUH`4ucue1yYBn^XTRIz zmFw5b`Yx;fx%iyQ;V%Vm*5}D>|9rKGZ}$w-y5nl=i^Li)ow#@3Wxu$~RL$1*{lmjC#m%BaP(ycGxct&iu>)(38SI}s)ZR18pYL>X!~MVSLQ@`G zi(LKpf4H0=0$epaKX=Hvt}TzNj;pNP zUt5v4hxN$q$L%STuCzDr2z6V}t+4PqYlQA|jqX2NqMz69>~nXy;(6chYj)!{?tAUP P0A=uW^>bP0l+XkKU-PD} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9646a3436df6887d47552cee85676671098a71 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$EMaSW-L^Y+$$ufq;9>>t*v zB~-iY;NcQn_u_%Z%%*7hL*@pn7r%eZZRr`mV1na|Ne+i46(7oEd2^X{njTg8TQ}|T zC-!}oKVsYNGrGV)h}zx*Q;sjRTw8r$uFv*k3vcdZIK|J)@FcRQ`?&h#^pDrRuG_V< z{@#<|x{Onw=g$ebJ0&jRoc?>W&rg%up8VbVY3~1Je=dkvHL9j8-ZNEIL8jG7ouR== zU7#<^@Kxd(`+b@BZrL6X68d(cRW(JMkw16t=FEGiSTAI5sD=WAEC{SSLR%Bk8>m14H$bvVTWB=GyBX5O}kf!K!ycy5Y3$$k~;@QZ@EF eDJ@$3mGw?=`tR!(yc&R^%i!ti=d#Wzp$PyZ$gf)f literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json new file mode 100644 index 00000000000..1b9ee617e6b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} From 244d9e1488be7512d72b47390a6b995f87a6f766 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 02:56:17 +0300 Subject: [PATCH 10/75] =?UTF-8?q?=D1=85=D0=B0=D0=BB=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/outerclothing.ftl | 5 +++- .../Entities/Clothing/OuterClothing/coats.yml | 10 +++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1139 bytes .../Coats/labcoat_pathologist.rsi/icon.png | Bin 0 -> 492 bytes .../labcoat_pathologist.rsi/inhand-left.png | Bin 0 -> 684 bytes .../labcoat_pathologist.rsi/inhand-right.png | Bin 0 -> 683 bytes .../Coats/labcoat_pathologist.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl index 16ac2d15dfa..13906204f6e 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl @@ -1,2 +1,5 @@ ent-ADTClothingOuterApronPathologist = фартук патологоанатома - .desc = Фартук для работы с трупами. \ No newline at end of file + .desc = Фартук для работы с трупами. + +ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома + .desc = { ent-ClothingOuterCoatLab.desc } diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml new file mode 100644 index 00000000000..341c606f518 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -0,0 +1,10 @@ +- 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 + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..bb74c740bd979fd47afc61ed427802db502b75f7 GIT binary patch literal 1139 zcmV-(1dRKMP)4BD1wL-3D}|(sa6kO>m@5J z{(xLkq3BT-n-Yqr#)JqV7b8{Cf}k)S%B+*^Cc87u#9#A)kYs;--@JYE-m-51g+ifF zC=`nSl)&#cKm@}qka#SFa-{+Kt!HM0#=>=yHn%{?{wI9M8%NF?O6w#L97OZs18GjB z`T%hMf^KhLd}IIsMD$PiJ#Z+klRiyDAUFuaED&~|VHQXrIEX$?!%$i$?XGbgSbYG9 z$3pf8I2^o)zApz1rFGIjIsyRLyR%}8QsS`?_U^0z0QyHqy6yz0e*fqQqLHxu=^q^t z)<5ZW0G)5qNEn-2762d`3Bxc8M9<6w46{I@kuU(@=EP}CPo+?;)lt5n6VZ9uPQO~K zcRcoS=B$03UwvN@KnGv4inbBcQz=}zyiBI2QUHKzt&Wma#O9U->X2?h_03$qtrM!X zI?P<2Tfd_NsP|dXa;0JaPo$Ezc)8MOF(w`h9my5Eu=*vdXzL#|o2b_6_UEA4wDsvt z@~hv`0j#JqoTw9=cSO(31XyE^13ll&<*~M&^);Q=*0TXKm-nsjIR(m2(_NZvWZee(#nSZu)FgvXrc%Z3Be4LE&EE%rmhG~*e)k1_eEW!j;jxxdJTN>4^W{4{ef639np}5kduNxh8Fq8a z0<8kTVLq6g7?<`WXqW|3vWm!DOdr{2=JH6SlH8BPzMlkv)(QZ$&UAe)n~PD*`%YcW1Sbfs6>?asb6y=Vgb!Ot=%)mCMTn_*IhF($uZ; z=cVr!?j@_(6Mcn3p-?Ck3WY+UP$(3CKSD1MXv+$K-Hep^HrNgNhMK;U6kR02eS$W( zK>9Qd0PuD1EjF`Pd+r2w@YBn;L0jhs&8EBs5}w0s#6n4cgoSmkmOV5oZs8oesfZP-+zH@9z^f>{%N`B2lO>;1s3M1r#!2yHRd8 zgBLCblq(HHBVpGbK(`k~c)>;iwT0To19xA**$JY(_+EC1s20_BZs$R$F+x2akA;L= zQr#etO4|8Hv@69m1)L3#we>8vcXo-H%e!`LWkNOCgqKJqiPZMo;Hk+YCB`rdBs@M( z!sGMAZNCf~sGi#zAYL1|roe-HH(a+r+gQZv(kw2WKf`l5AugRigVm*3Jlj}w-QUi} zc5vqa*6Y1^@bQARL1a}LcMeFTlD5#F&=oFM8Z86o%>hCWLe8bKv=;ZGJG-`?4bTp? zn;pCyYkk01vSTNO%aTuO)9+D;FQy!jnLorwp${k*cOKiDb2o@%w?`bb^n&Lplxb0LB<&j4{R-V~jDz7)wC> z@R3war~CSo=H2a6HJy^?EwYtHNWQI5RuoYw7ZF_q!?Y+XipaN>Sc4AoqLWoMosI`T zkR=$D&Mqd?83aMd#LX+o66T(V{Zh?F z3M4riA)vv0aDUcSQC7U6yC-P-=rSL!EPV{e%q SAbfv`d4j(OFvb{Tj4{R-V~jDz7yz}? zqrc}Y+o5gqGEh4`vTSD~TUy>{+a^mblMYlBuIEP|wrq!L)d~(&6{VIb)lCq2-weMY zeiPJAk22>C!;oChr&7x#F}7@nT+gR445`#Iqw$kelTkdc>-lteeM6S*(BbvXAM;6h zH@*Riq7Rl?98(UXe8R%zMq}98m)w>jiVKmmy zuJ+3-7LG6s$+Dej9RFpINjz`-NXz>?>B4ljipG=C7`19;V_qilT!yYiuWVZ0#5KTd zpBL=@0KnrSX!i%wEr3EiuPA<(ys5>!d;1~!3f+EuFJ Date: Mon, 1 Jul 2024 03:09:24 +0300 Subject: [PATCH 11/75] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=80=D1=8E=D0=BA=D0=B7=D0=B0=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Back/Backpack.ftl | 5 +++- .../fills/backpacks/startegear/backpack.ftl | 2 ++ .../Fills/Backpacks/StarterGear/backpack.yml | 11 ++++++++ .../ADT/Entities/Clothing/Back/backpacks.yml | 9 +++++- .../equipped-BACKPACK.png | Bin 0 -> 792 bytes .../Back/pathologist_backpack.rsi/icon.png | Bin 0 -> 562 bytes .../pathologist_backpack.rsi/inhand-left.png | Bin 0 -> 423 bytes .../pathologist_backpack.rsi/inhand-right.png | Bin 0 -> 432 bytes .../Back/pathologist_backpack.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl index 1a308ef156a..eb727df0cd9 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl @@ -1,2 +1,5 @@ ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоанатома - .desc = Большой вещмешок для хранения инструментов и бумаг. \ No newline at end of file + .desc = Большой вещмешок для хранения инструментов и бумаг. + +ent-ADTClothingBackpackPathologist = рюкзак патологоанатома + .desc = Рюкзак для хранения инструментов и бумаг. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl new file mode 100644 index 00000000000..49ee2cdc873 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBackpackPathologistFilled = { ent-ADTClothingBackpackPathologist } + .desc = { ent-ADTClothingBackpackPathologist.desc } diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml new file mode 100644 index 00000000000..db6d2cc3c6b --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index 31c5b891082..be0ebdc88a4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -4,4 +4,11 @@ id: ADTClothingBackpackDuffelPathologist components: - type: Sprite - sprite: ADT/Clothing/Back/pathologist_duffel.rsi \ No newline at end of file + sprite: ADT/Clothing/Back/pathologist_duffel.rsi + +- type: entity + parent: ClothingBackpackMedical + id: ADTClothingBackpackPathologist + components: + - type: Sprite + sprite: ADT/Clothing/Back/pathologist_backpack.rsi diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..0f4ccfb1040380b21608104805cfc9bf79c7072f GIT binary patch literal 792 zcmV+z1LypSP)uDI`N_gg}Ng`2&*XI-1fYm?fbu z6&ea5gG!`>*U+KDHG_~sB4&6?v=9zUBX0+}Llfh9@k9@v4;*;+obUU*ukXEz?+Xw@ z2qA7h3m!pRVk%y@#qvhZUGndYFq50UWLakARe7E zT>l+YvmCHoCab+Z{CU(CD@bx%yjPa$0I%PNTqcW#qF{9;pHJ1&jEH;l zBQtAl=W5)DflOF~@aW}h?wAzt;@>ztZUK>*HH=L-@%QW(QX7jXNHRX&t)pC&!8YIb z+%C(^0sO3na#2RE@&^Er+E~PNWDYy2b!`GH+wX&)8G8&ZGXenM;j<`zQg5d0_4~Bz z>g<0o&hh*6wxKpzssmaD12Ju`+1=Z+Y&!@cgb+dqA%qY@2q9!Nsq65q|Hh7*U?9fT zy#uBeEQ(3)bT4qm7|-uZ-0li%hp83aKx;1feTg&1xYNC0UMHxZJY$TDV)Due7-lD2 zt~(fraZyZi#+W%HK^;>0ed*evKS~{-3I<}@NY#5}bytU#^AoJDB-)muMxEF1!|F-` z%K3@zy}FB|>eBN~*4~F{X*mu6Z5t^%={f>_94XrCPHXSI>=_uO>-HnG=GxkZPP%r$ z*n|_2nKcw78IDPzV*)*AJ0P8Ma7+p)NV2wvpqs88P(99Lem2xxdoNn&5hxd%`vvA_ zL#Q6-yWZP%4yc_T*m9Z29Dw1C2gB6N)rMRqi`wadIiqxxe*s=*rCbRigb+dq8Iu2c W+-dWm6rh3t0000?Sii>&44{U=RD=oAcY-YE2xMt)hU{l{LPeUg;^M`17j?z@3NBxqj`pZCbky02E3^ zT5dfyuI1J#l#12@VmmN9GcOCJB5Ds@1U^B#!RpFdr0@X)gINH&_KSS~;f?V`SdTyv zv>O0Dzw%SU%%SGUKT5aQt=7^&0z-YN5 z$0l-c{IO%(eECS5Naq`y$U(Ux#j9t1_ky+q((^g0?Q07HEL68xsBRf!j%xcz&)52m zBQPygh0nc1Zry(HPdSVNG9$xer>BgI&%HyVA0RtDMP_6;xd7?;G*8^l`{ys=alCfs z2-*#Tc7wN@PeZ=$*yf3A?1J$a{uDx+7~t{J{l0cnjwsp=oNaGp;^t?A^nA{?H?+5* z)gOo1nRyAlx1SF6C5*do7B_&1i7v2fon`wftHUIzs07*qoM6N<$g6FOZ Ap8x;= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..24697435236d47fe3b1f1d58c9eca6544d2d2ca0 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fJ$aSW-L^Y+&H%)5 z-CxcyzW0nSa4_Xq-HSHxiimBZua5CFHyCX!A8e+P3O9$*}A#- zhUV3?tsl3pbNw`}KwUCSf_bg!y!g0s=%SL~N3_Vq|R~_en<(5smCKVdW`DWGp6N?}1&0k+y`?;F;bLG7LIPG)Y z^*?n^ACY(5cwocJ`^)6&H1a#^8I=%VQOdbnWxc!VBC<1V+A?x4MBZLD?eOw-%zr}q zA3Gm^yfIW|Blm}U+p|TCnOD}aY~+sk{K4^s{Ec`18G5OgAds0)u6H<@&FdRe#*>-K{=%()We$-C6}KB$}N% zzC}sQe`OW_=*+Tbd*ydUE)`iarJ}B~d5X}~pr4b@d3bR$cviBDGcd@_kNf!dXJhY; z*!geR4n0{qrQlp|-Tv>Q9OsVPnkBWb|MmA*iMfEkRjQz#9M83=`c<#v-v!Hawqd7{>i3ac#f$4j$wbeWcHuy^B9$0eP#Z- XV|(dbCeQ1@m|*a9^>bP0l+XkKKK{Y! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json new file mode 100644 index 00000000000..880271d7b62 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From c8aa683acfb984440adbf211b7faab23f3be1423 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 03:14:25 +0300 Subject: [PATCH 12/75] =?UTF-8?q?=D1=81=D1=83=D0=BC=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Back/Backpack.ftl | 3 ++ .../fills/backpacks/startegear/satchel.ftl | 2 ++ .../Fills/Backpacks/StarterGear/satchel.yml | 11 ++++++++ .../ADT/Entities/Clothing/Back/backpacks.yml | 7 +++++ .../equipped-BACKPACK.png | Bin 0 -> 676 bytes .../Back/pathologist_satchel.rsi/icon.png | Bin 0 -> 697 bytes .../pathologist_satchel.rsi/inhand-left.png | Bin 0 -> 575 bytes .../pathologist_satchel.rsi/inhand-right.png | Bin 0 -> 612 bytes .../Back/pathologist_satchel.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 49 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/satchel.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl index eb727df0cd9..174481ffb31 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Back/Backpack.ftl @@ -3,3 +3,6 @@ ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоан ent-ADTClothingBackpackPathologist = рюкзак патологоанатома .desc = Рюкзак для хранения инструментов и бумаг. + +ent-ADTClothingBackpackSatchelPathologist = сумка патологоанатома + .desc = Сумка для хранения инструментов и бумаг. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/satchel.ftl new file mode 100644 index 00000000000..7c9d98c4fdd --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/satchel.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBackpackSatchelPathologistFilled = { ent-ADTClothingBackpackSatchelPathologist } + .desc = { ent-ADTClothingBackpackSatchelPathologist.desc } diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml new file mode 100644 index 00000000000..b2c02ddcd50 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index be0ebdc88a4..0853f6b761d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -12,3 +12,10 @@ 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 diff --git a/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..994b3bed2478abde6ba68f4153af1284f6413d76 GIT binary patch literal 676 zcmV;V0$crwP)>y<9wgA8?T-@B8~D?^$>cV2m-w7-KB9hsP&Ud4Juo zl-@rUcQ_)?^GH<_bi*RE*q~g#mcAzB@-;Gx4RVJgrQyUlGMn%z?hSJJ8XcaTVY%>O zeJy5WgxY30X=RoRABQJrkky1(fkp9e-ZQ3?meS%?jl1(3pc@t)XnNws1ApIyH}4q- znjU*$+$p$jSfpi5EM8yW&)h_dmz^W>MQJHsR-RB(KsPM1?IxwIcmVKcZf5cN0xfHP z$Qkzf&q05n8x|d(UZ7kmAZ^79{>;t50BKnhxh24`SNaPf`rLgU0>gT^ut<+OLRT*Q9F~%5Uj4{R-i@_a^D3`BA+6?(` zJUl*;=XsQxCL|d^9F|x;k+Mq@VjqwY#J*t?Ru5(T`2OvE`)fLBWuj(~vd5+tH4k38cbBOQtl6&{kq}{v^4*vV^z5n~(fB*mA0WMtp z@9>;gpg=fIc>d#qWg*A82ndAZq^no5`AtJdty;$KpLs`~i=7Z^T84Yt*Ka=p0BY4T z0HCLDsQ$nY;v}Li0hBnA7!$5brJi~K!0QW=g_je!dgU_q50A)`NB29=xTa-DrBZ3Q zBqd2CC28|pGnC)nA%7=_#0o4%5)Fl%8UK zD`;!-I)p-46y5$o0swbzUPB}n1puguEEKr8wFdxL%dKK#_ZxcphF}`H<2-Qe0;;}0 z!)WfDV>t59Nk{n_GMA-U*Rd6sjUK!I4;$wIvU> z3|Pq%i7}S)`ME_*&rGs)+SeRXcVjl2lGC-&H4HYZbr=bf2ootT1`7wV`R~4Mn3WGCQ?3(3^o=DrZO6}F-krV(yLu%A!f|qZuNNlZgWf5-~}XwFKzq(T8!5x~iuxBgg+43BfO(hjju0B|x1>Cc5| fnz?Y{;w<J%=P)Ks5I38Fh(;-6$#mPXEEvrLjlT0Dd&4ALaLqLZMbm`z=p&bHd za1?aPdP0^Eb#r(b${9^AA>Qx(u7P|%%W)^Xd-s07JBRlGA|fIpA|fIpB8sBf?n<-W zmH(Z`x;|(GX|}uadE*m$caBE56}7r2%f~mVR`+D+Pi5#&W&7JtS-!3jS43p!PpuTd zc*%m*Z+V?3zwPa8;m_YIRChPmzE2Pr0CJfm0Kjn^^)2>MBS_2ZU~gv&xl9uId>(_r z0Hg5?Ew6)YI%O31^q_*#c(y2lHsf!Ae{+k|gUVtDlu9K456SyCw?=Uf&n}S5BrzJ# zOj8YIT!3skwMcF>o}tlbtei*P0gvO_qVi6?^!Imuc8GqzAL%}i<3{}o{ z-8Al-6qc;U1K2Er`j&ECR}zT?0AN0!N8bKnakXL*5fKp)5fKp)5s{`i<^;6n5me>_ zmVN#HTY7hn)goxlBd8bPs9eBgGSLpZB51fCl?yPPM^J4v1PT25ae^=V$H=Br>isrZZw|Z+MaD^dcGR3KrF_5TkY(L_I-aEA9zaAyL_|bHL_|b7w(E=S z`jU1YCOwJs=ioAjqr-hn-H>mFS zta)&r%O?0AZ+>NYD5WHy&jSEvvl%*_PA1EKky1(?L!LxLL_|bHL_|bHkJF}l29k;q zt3P0wP4o=dt}nr54zDl18IKWr0dDsUoE`50K;oOF Date: Mon, 1 Jul 2024 13:00:16 +0300 Subject: [PATCH 13/75] =?UTF-8?q?=D0=BA=D0=BE=D1=81=D1=82=D1=8E=D0=BC?= =?UTF-8?q?=D1=8B=20=D0=B1=D0=B8=D0=BE=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/Clothing/Head/hats.ftl | 2 ++ .../ru-RU/ADT/Clothing/outerclothing.ftl | 3 ++ .../ADT/Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Entities/Clothing/OuterClothing/bio.yml | 10 +++++++ .../hood_pathologist.rsi/equipped-HELMET.png | Bin 0 -> 736 bytes .../Head/Hats/hood_pathologist.rsi/icon.png | Bin 0 -> 447 bytes .../Hats/hood_pathologist.rsi/inhand-left.png | Bin 0 -> 378 bytes .../hood_pathologist.rsi/inhand-right.png | Bin 0 -> 387 bytes .../Head/Hats/hood_pathologist.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1407 bytes .../Suits/bio_pathologist.rsi/icon.png | Bin 0 -> 668 bytes .../Suits/bio_pathologist.rsi/inhand-left.png | Bin 0 -> 570 bytes .../bio_pathologist.rsi/inhand-right.png | Bin 0 -> 592 bytes .../Suits/bio_pathologist.rsi/meta.json | 26 ++++++++++++++++++ 14 files changed, 78 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl new file mode 100644 index 00000000000..b423decb4fa --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingHeadHatHoodBioPathologist = { ent-ClothingHeadHatHoodBioGeneral } + .desc = Капюшон для патологоанатома, защищающий голову и лицо от биологического заражения. diff --git a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl index 13906204f6e..03e56f75a98 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl @@ -3,3 +3,6 @@ ent-ADTClothingOuterApronPathologist = фартук патологоанатом ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома .desc = { ent-ClothingOuterCoatLab.desc } + +ent-ADTClothingOuterBioPathologist = защитный костюм патологоанатома + .desc = Костюм, защищающий от биологического заражения во время работы с трупами. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml new file mode 100644 index 00000000000..95f3c280fc0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml new file mode 100644 index 00000000000..5c07d25042c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/bio.yml @@ -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 \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..b8689d254fb9a667aba9a8dcec0f3452c7bca1cf GIT binary patch literal 736 zcmV<60w4W}P)dO%yuBMM|L^6mcl%5GcXZEI~pL!9PU=hYA@a zw8({ubg7#nSpt_*GK4@#dV%~A@=pS84$q|*l3px*ujZ`y`@j+M!h648US95o-wz=F zH;2fiO>KuA9=o-CLujqP9iMxW8cDF_+cz!a+Qv3szIr_IP1w|SnAhX7jF-xd$^Qsy zB*FCEJnQv(mP_BwGc}U1{4%FK{#o7$rE&vHiwn3kb#XA(ZgueF*&E)aP6h4_h(*I- zOLy?|@)X=Y9{|A6wh)VkvAA&ePv>V*DmO6Wo*p|c;><~sF^a{LOcz!$YDd23!My>U zZX1qt3g5rA&|Z6rjJAafUp}GJZ3`#COWW8+#i$J~ZDZTE*ia)0CP@;LWtjzoK_<&G zlO$>4H^AZeo7xW3ck?5!cEuksH$jpldjk_f2qA1Ed=*|9saj``9>tk_{VD(;bI_BJ{_t^d8bo>og!%)_K!*d`(Jyc~#_w`D zF0K>cR|1wJ*6Ft4E9fu)$aAxBq*FqP9ET&F0#;RIv@N&`I*JE93FZyZ%#jDz2JB^X zBLTb~7uJ&+?yoGv*=*umL5ES@pV(8tsO~$0@87ZW%_fTdKGu^OydD=y<;EZ{-g|)1 zV{qK~+vE#4oley2^@%#0b5jD SN>TOz0000l3xtMR9EB1Z9HK=KogJJN!L7j|$iXREYzU$y5Rx1k zBr_c3uv#4Cz`?kNI6>0x|HEjxXS@3!zVGGkyYIll!s4H?$;jnORX1}Eqx(`dh2?Uk zs{7XzQ?J!lr9udaqRoF3!Y(2;YITeNUeC%*@1@fn`=TtE3F%~3kH#Xj+Uk$Zjc~2D zN;DQBoy?lf3kW`eR$FCnH^kL-&D0h3qyhk}2R8t4I9xLwO&gE`^2O5p0|1OdVLk#r zmfXwV&icJ~Mo-V!Yd10_M$GJxq2{x#A8I?blk{kaF2H^MWJ zFP2Cp;`EP>>E7P4_;?R|P5vkp#u@N2JUf;80zhyTr;}NIGqeprDiO!waG@w}093Vy zrVS>7HfnWpg^W;bp;wSAWNg#ctE%=Uu4S8p7oDt002ovPDHLkV1i(l#=QUl literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ce338af8f3d8eb5e941389287b0fc82d2a6ea839 GIT binary patch literal 378 zcmV-=0fqjFP)D!Z6vpvy$zA}%g4+TH0egVyJ^&AaIhJIS5PU6$N4aWZ4=}KJ%0-~2?*wU6x4=#p z8veheX;bm#p3~c!Qwab700000z&&~J3^TLT@AoyE&D?U$ES1-*)yj3fuFNdOqDUcx zYQeE6QoVp{Gt1n1wilO;*F}h{d zxoxLB&(nB3mLv@Z1MPM@Nz!Jsx%#76&n(^SDcv05FRCMikS=Y4>um5pd5z;++W^UD9Dlq2-2B389N+34(8M?%0B}!! Y0MW}sAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b1f44f7cbf4074c94d5b7efcc534403ca6d276c0 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$2IaSW-L^Y*4;-XRB(mWTF1 zdJf4h?kZAJ?+z(uY}@LR`IG7PrGhDIg9;elh-JN5y1;AiN(aWqWTk*TCu@W@wZ6If z;mZm(7Z`YAUzz!P!B(@J?a^Z0uCL4Mx((H2-q+8$E+JeKI+w5L9BX{&!`BaEpUmMt zz9#q6zPR6)B!oZdB*#wUd0xpdW2dOM!g-^H3r~GtsB?zK23Maiv1)DG6VA@CLC-ra z&ozGn!v`}trAw=UN}y*w-e>J0+V}ywneQHvOFx!;$Ej_lv^M%4VnDd-9IAW22F{py1AT Z!Xj(-I?nZzNdyKigQu&X%Q~loCIJ1~rH}vs literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json new file mode 100644 index 00000000000..b3783801da7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/hood_pathologist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..01460d232969130ad7e9b35dcd086f6f27ae3ae8 GIT binary patch literal 1407 zcmV-_1%UdAP)NklLvUKiKM&(?|IJqJb;ajjg5_sjg5^lMn@)@%yBF9gP}PVU0Bq-o7F!hE8gATi|E3lMl8Cp z$h!M`Eq4OxceFKPb!`&>u)4O1j;brm+bI03B_OXl?dGRaNF04lq?!S!=T& z9c_)8?^PPT{?*I<{8f&=AqO;#O)$65i}5=*HOJ3g=+t~3zjG6ApSR*p5cOM|{rq^( z)d#%Y+Uz%_f1(3|p*iOEc{M`B#?mr3qdp(iF%cnQ6 zrzY_7=?%?sS^b()Cxf9mMhnhPI*s{o1RZUS8YhHjr+J&cM+;LhG{=Unf2v50wuC+{ ze8kMJ_jr3fku;@W(gA_n_fY5U!rQIa$flx7+;x`GVpEKGB!=|!CraSepNxK24%N^v zc?r~cyHIn+4Tm#--FNr*YR>DgO*-#z`cZSnjXH1Fi3XITug8pj$r)0N`LZqxroVjOdG)(J$!$;WI3on`48a=^P>7P;*tYS00uX0ZcsLAn((HSg`* zb`p+5qbr4#`XwFk&tJbO4ebLgx1B^b6;(!CzBm$!0^pzHkr<|Cf(m?Kj>F%Z8nFTW z)@DD}6G{GVR{z8qAa){(1BEzT42}RGn~Ew~M5PBTt51}pFZD1aijl`@Cg_c@n)z@9 zpvt`d*LG=WhysHDEsHR>4-Fj{N?;LS`>`RLjZkGYk4 z7t+t4ly%*gLewgzPse2XG;|jr=;?1`X&Is;lzJCGmzL>J66g7L0EIh%s9)>x007=d z_9^9n(T1jcqoFB31p$21a$Xam4M`dx!-JlWdAm~jQVuvS5<4kEs}%2B-^Rwq#>U3R z#>U3R=KoE#iXmh$Ym@ZuO|c>c0J#0?4@-B0L_EU*_QNNi@z0uF>Bo1ivte{(l0_F5 znX0P%onD^dK-Fdi6=u*&v`Ka*nBEoEv-0S^Wz``fO=A;m<;kW@ZSrGeqftz4ixYZ7Xk*e!^cv-E$xH1CUjF=Bo^pP> z^%~*X>8j@h2vL{n2*@rOq-Fr+>&2YCNU>U;N>faO>H*BuBuF{n;rJl02LkdlLJ#HV zt)N)nWW&L32777(561_k`jol^ZoLTNgTprE?7s~C4gfq~?{NB2sl=!rhtrRZrDc2v z@S-h!J;1FOL8(5a93VnD`~9>JKp|U`+qP~^$ZaQ4qkhP10svs&f_j8wp+KmieSo=q zeVRaoYIv=-f$DI(}`wVnhC@!^Y7<+8N_Kp8VY%*j_H1lA*Ji+_YHrf!2`PCg!q z0sFv|X%oybxPJ<8oke#~!45Mvn4SUgNQ~#@E!~7T2GSJmu(7d`=06OZg7-Gqe6j!l N002ovPDHLkV1i=Gv4#Ku literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/bio_pathologist.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e3e7f9addc3c6e1b86706b89430b1eac048b2af GIT binary patch literal 668 zcmV;N0%QG&P)+Xy)I-Fp7 z;{&6^3A#I@o+x+TUlq_XwEPu2JQ!W6n`G$f*~fMhByb<^;^yE~(v zeYCR+z=P3eJbe6?uAUJ9bkiW2O8XMwYX??_1}WJE0KOjPJ%39$OjpkcKb=D^&P!~r zuTruLtPBnM2@61|)?hM~mho7Gy@O-UibXzdW{AfkRU$UmS3TREw|8(%JQg9DO3R7y zv6_`pQ^4f(Q`(GPeiS|$cjfg8s3e!kQhfDNncVm!-F5Y-c?4}nFQH}~we{-U zuh)O&-KZQ_Tcd=Ub=r*Hx&mtMz-3u@wq_2f8XWEHvJ8~$0%ye{(h;bwQJPfEPgwr~F3W=QX`T>qq$4;3 zFQHqC(z*KE@@XFRw`f1qyaOluYl@p(*p{NSYhE(x2wpsz@N593T|?NGQa;UdSr(k^ zuhs1hb$6gLi2L##?d&2QfqN&EcFh|r0>ZWwfmJVb<0MmQ={SzGwzj3)cxGpoq_wpz z9mkP=U%yIx-2s=0@iFC39WV9nJ;1HnaX>)8f9Dq?762`YxXWq)00001yHpLueXPx>#TF3jx^B;G*Q!g-fz`zU5CWA?J6h%1I)Jft8yrBywWp0>ep1r-aiQW2O-fNb}o^!NMPd(NDpvdvDXV1@^w)}Yeq%Tho+h6~jqHDLm z;_U3FPD>g8zH|82&v)s2boJRU75`r_L~b{^zUHa^eDl*sy?ZD4+wXf^{7G0eIpAy7 zj-9)XRWs~gzTaT}Sp~C5&Ft*;KbPo;Ywp=n28g4bj37JlZBH`M%&TXO=-SU5nlq}7xeF@I~a5zdZolNlQ z<6HDUyjeJ37PFbMoZ096`B~Zm1b!&H2YdPVjh$wGynC>Rzz<8){+apAvk$*4^Hbg8 zyDy*dKK+V{m0n^{``01%a83gj1GU0mkt zWmRbAzz^lLcb5N)iUzTq_Rge??VqtRGZ7IH5fKp)5fM>&**G(BAMMVNj*T+|CX5PT z Date: Mon, 1 Jul 2024 13:03:12 +0300 Subject: [PATCH 14/75] =?UTF-8?q?=D1=88=D0=BA=D0=B0=D1=84=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=BE=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prototypes/adt/catalog/fills/lockers/biohazard.ftl | 3 +++ .../Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl new file mode 100644 index 00000000000..f930860baf2 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl @@ -0,0 +1,3 @@ +ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3Pathologist } + .suffix = Заполненный, Патологоанатом + .desc = { ent-ADTClosetL3Pathologist.desc } diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml new file mode 100644 index 00000000000..a06dc14df77 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -0,0 +1,9 @@ + - type: entity + id: ADTClosetL3PathologistFilled + suffix: Filled, Pathologist + parent: ADTClosetL3Pathologist + components: + - type: StorageFill + contents: + - id: ADTClothingOuterBioPathologist + - id: ADTClothingHeadHatHoodBioPathologist \ No newline at end of file From e05c0cc6ad7ffb226037746313a76ae92e08b78b Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 1 Jul 2024 13:07:47 +0300 Subject: [PATCH 15/75] =?UTF-8?q?=D0=B2=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../structuries/machines/vending_machines.ftl | 2 ++ .../Structures/Machines/vending_machines.yml | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml diff --git a/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl new file mode 100644 index 00000000000..6bc54b21f2d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl @@ -0,0 +1,2 @@ +ent-ADTVendingMachinePatholoDrobe = ПатологоШкаф + .desc = Самая стильная одежда в самом отдалёном месте медицинского отдела. diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..b3e80f7fa17 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml @@ -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" \ No newline at end of file From a6e8c0aa5bbd4e84821b6fd994926505e474925a Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 11:53:27 +0300 Subject: [PATCH 16/75] =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl deleted file mode 100644 index 49d25c8db05..00000000000 --- a/Resources/Locale/ru-RU/ADT/prototypes/spawners/jobs.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-SpawnPointADTPathologist = патологоанатом - .desc = { ent-MarkerBase.desc } \ No newline at end of file From 91d80cdce0d78463d207ba084566c2cc58d974a9 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 12:05:26 +0300 Subject: [PATCH 17/75] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/entities/markers/spawners/jobs.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 375b56af253..08394cbcd5a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -98,5 +98,5 @@ ent-SpawnPointPsychologist = психолог ent-SpawnPointZookeeper = зоотехник .desc = { ent-SpawnPointJobBase.desc } # ADT -ent-SpawnPointADTPathologist = патологоанатом - .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file +ent-ADTSpawnPointJobBase = патологоанатом + .desc = { ent-ADTSpawnPointJobBase.desc } \ No newline at end of file From 3ba635833a38d41db8bca0eff5ebd6ba0af3574a Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 12:16:17 +0300 Subject: [PATCH 18/75] =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prototypes/adt/catalog/fills/lockers/biohazard.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl index f930860baf2..fd7a8f65d44 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl @@ -1,3 +1,3 @@ -ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3Pathologist } +ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3PathologistFilled } .suffix = Заполненный, Патологоанатом - .desc = { ent-ADTClosetL3Pathologist.desc } + .desc = { ent-ADTClosetL3PathologistFilled.desc } \ No newline at end of file From ae136c0db59e6c584003facf1ce873f6e3bd15b2 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 12:38:32 +0300 Subject: [PATCH 19/75] =?UTF-8?q?=D0=9D=D0=A3=20=D0=92=D0=A0=D0=9E=D0=94?= =?UTF-8?q?=D0=95=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=BB?= =?UTF-8?q?=D0=B6=D0=BD=D0=BE=20=D0=B1=D1=8B=D1=82=D1=8C(fix)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Storage/Closets/Lockers/lockers.yml | 19 +++++++++++++++++++ .../adt/catalog/fills/lockers/biohazard.ftl | 11 +++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 00000000000..e14661372ae --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,19 @@ +# Biohazard +- type: entity + id: ADTClosetL3 + parent: ADTClosetSteelBase + name: level 3 biohazard gear closet + description: It's a storage unit for level 3 biohazard gear. + components: + - type: Appearance + +# Патолог. +- type: entity + id: ADTClosetL3Pathologist + parent: ADTClosetL3 + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: bio_pathologist + stateDoorOpen: bio_pathologist_open + stateDoorClosed: bio_pathologist_door \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl index fd7a8f65d44..173aca3d74c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl @@ -1,3 +1,10 @@ -ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3PathologistFilled } +ent-ADTClosetL3 = шкаф снаряжения 3-го уровня биологической опасности + .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. + +ent-ADTClosetL3Pathologist = { ent-ADTClosetL3 } .suffix = Заполненный, Патологоанатом - .desc = { ent-ADTClosetL3PathologistFilled.desc } \ No newline at end of file + .desc = { ent-ADTClosetL3.desc } + +ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3Pathologist } + .suffix = Заполненный, Патологоанатом + .desc = { ent-ADTClosetL3Pathologist.desc } From 7a512cc2a1218c8f34aae0dbe96e15e00841bf7f Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 12:56:46 +0300 Subject: [PATCH 20/75] fuck you --- .../prototypes/adt/catalog/fills/lockers/biohazard.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl index 173aca3d74c..c8296fd1be8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl @@ -1,10 +1,10 @@ ent-ADTClosetL3 = шкаф снаряжения 3-го уровня биологической опасности .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. -ent-ADTClosetL3Pathologist = { ent-ADTClosetL3 } - .suffix = Заполненный, Патологоанатом - .desc = { ent-ADTClosetL3.desc } +ent-ADTClosetL3Pathologist = шкаф снаряжения 3-го уровня биологической опасности + .suffix = Пустой, Патологоанатом + .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. -ent-ADTClosetL3PathologistFilled = { ent-ADTClosetL3Pathologist } +ent-ADTClosetL3PathologistFilled = шкаф снаряжения 3-го уровня биологической опасности .suffix = Заполненный, Патологоанатом - .desc = { ent-ADTClosetL3Pathologist.desc } + .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. From f734b34942bcd4b9a99bcc7068202f1ec9b0b3d9 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 13:22:50 +0300 Subject: [PATCH 21/75] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D1=81=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/markers/spawners/jobs.ftl | 2 +- .../ADT/Entities/Markers/Spawners/job.yml | 11 +++++++ .../Textures/ADT/Markers/job.rsi/green.png | Bin 0 -> 309 bytes .../Textures/ADT/Markers/job.rsi/iaa.png | Bin 0 -> 1080 bytes .../ADT/Markers/job.rsi/investigator.png | Bin 0 -> 1010 bytes .../ADT/Markers/job.rsi/magistrat.png | Bin 0 -> 919 bytes .../Textures/ADT/Markers/job.rsi/meta.json | 29 ++++++++++++++++++ .../ADT/Markers/job.rsi/pathologist.png | Bin 0 -> 1203 bytes .../Textures/ADT/Markers/job.rsi/urist.png | Bin 0 -> 931 bytes 9 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/ADT/Markers/job.rsi/green.png create mode 100644 Resources/Textures/ADT/Markers/job.rsi/iaa.png create mode 100644 Resources/Textures/ADT/Markers/job.rsi/investigator.png create mode 100644 Resources/Textures/ADT/Markers/job.rsi/magistrat.png create mode 100644 Resources/Textures/ADT/Markers/job.rsi/meta.json create mode 100644 Resources/Textures/ADT/Markers/job.rsi/pathologist.png create mode 100644 Resources/Textures/ADT/Markers/job.rsi/urist.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 08394cbcd5a..1ebd6d8e974 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -99,4 +99,4 @@ ent-SpawnPointZookeeper = зоотехник .desc = { ent-SpawnPointJobBase.desc } # ADT ent-ADTSpawnPointJobBase = патологоанатом - .desc = { ent-ADTSpawnPointJobBase.desc } \ No newline at end of file + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml index b5bba07e35e..3198ac42bde 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml @@ -1,3 +1,14 @@ +- 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 diff --git a/Resources/Textures/ADT/Markers/job.rsi/green.png b/Resources/Textures/ADT/Markers/job.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..0becfdb0c54a42a943da2d51056a0bc22c451f37 GIT binary patch literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Markers/job.rsi/iaa.png b/Resources/Textures/ADT/Markers/job.rsi/iaa.png new file mode 100644 index 0000000000000000000000000000000000000000..f93b5d5034934904799b7de460efc5b6c7995570 GIT binary patch literal 1080 zcmV-81jqY{P)ByqRTId+WSXp$ghoWnPS4NZrN68@-v95v05DLS;3~ zB9w5weiZ?4+*gYtno?UZf{3qa-=evH#6`&hx&{^ZeiE z<2~=Sf8*jtfbTfWM~?6lu|s>|0s!$4i3GYVCBsYI`mFF9uJzP0f-e64RwL(+{CBTpOhaKr>frp zzu#Yp)c-=@c4L~RF+M&{B9Q=pH$TmP$%%ms{k_4OdQB66@~#ZSARdobWU*Kbfa3?h z17P-K8}WD?!!WotTJ=yfS7zu9!$2tofUfHRD5Z#pU*_r5dwl)E4ucokxERX-jcO4$Gm!>Bm9`RWx`viEUlx|1LND4A<*CfWatXf!HY+Zmago0DCq5(orD z*L4Yp!?JImPr~7_=(;X}KtME26M(t7IoaCINHiL)TL(2G&}-iyK0iw^pWxDDL;yS< z4^WQE2QS@QNsTGLG#Qa#K0$nbmR|ct-A&dcAh{d>sn{a!R$tXzHk)O1`cJaiY?a*I z>LV3ftkQ3qKqj5$#A~DM*SkorFI72LN}=mIN~tOm$@L}n>s{oGzsRK1bqUlxv5xk5 z1YmwGYcq2U|8@gV)t*Wz+r`tP0`TPN59`{mx!`DzN5c1)ziz7=d45gbQ|WP~6q=@0 zMxdd#yB(IVWTx|MHj7~x73bz?6-^N^Yhd?mFk7@K0+w#YcLH~vK;0CqZrq_u<}NH% z?5%AG<(At^X2oX1MR?)-c>y>+GJ?glh{(B#iH2`P4KW=X8{5-hBoeXJnrp=N yKf{{BhB>XC#{d8T4rN$LW=%~1DgXcg2mk;800000(o>TF0000y z@H|h)>vp@H8#T^}Q4-J1o!8z>jn$8RyqOwvbLaJLL0OPmx#xL$aw+hH`&|_GC7h-fMFQC-hRTZ*&2@HBwVl8<3jTR-+NOirH)4cfH!kS zPfXZcXg;96%kWkXZq3%%+6rm^@-S1(%*_*v*pE??L&hdtTfVOAQ#QYMpRoAh2b?aS zOxE=&o3-WZBQ;`b+_|x&Z(m!`fUZ`n`llbhN!GWoE$BNpmNE;-Y}t2L-qA0<@)}0* zIkq-7n5b4!(NiAZTjz}{UmkA>0508JbblM_kuOE*`uh5|A;@Y&deZslNQ z+93=>zJB+ugnRq*Wo+B#;-emQ4e#x29nTyvO%o|4+uPd=27`pl=kpW_1!6wS97t6H z&+~MpQlUCk1)xwUU>F7fhG9@B6ac7BRjE`eWEsn2X_Ln&7K3wxQM<$2$41D z7N%)p+xCHTola+HKMZvs4%%!sb4n?M5QjQ&*ts+~QozMWJpiPXd-gwFeE-PL@%i}q zkp-+wJ48{0o408+8XCZ|tV12JEDL}}qoLirO%z3}OgjgI?!%GwnLm3@zx3)E0J_~S zzVBm=TZq0OilU_6#bPnpcU_lqxeUN>KR)E{&ujm#2fE#EvX)X3Yz9av3B!<2zW6F> z$aw#-=Z?bA@9F&6bK0yH@qHh|FfhgpL|+hwA%nqyd_IqD+gRfkYDb}z!gXEbMl|&H zsRYEBot@Qb1vHz@)NzMS!u?P?&!*sDFi0li?)|LD{5nn&Dn$?kx!ofE7XeDC19L%2 z$*4k7mq1E+AaNG{pOD&tcDtP$%Nva44LY4pl1xfTr_&+kvi?oWR07v6c<=Hzbu1Sx$0000hUSV?A0 gO#mtY000O800000007cclK=n!07*qoM6N<$f;qL;p8x;= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Markers/job.rsi/magistrat.png b/Resources/Textures/ADT/Markers/job.rsi/magistrat.png new file mode 100644 index 0000000000000000000000000000000000000000..1e86415378c650b5c783292f7798169466714109 GIT binary patch literal 919 zcmV;I18Dq-P)8_H$&&y6DFwj=7R_KQh)4)dFlX5bG>r?)@ka8 zF0y>D0fQI0Z_lta7Y-sYKy`D5f%GViTAfCGmPW14Kzfww=1iFS!F2QT1+nrmNhA`o zu&^K}UVFt|TltvWynJETL)lU0>^ZUWF##lzNXXK)Z``$&kBK>ZE-*mg>9z7Px%cQ( zo{N3x`dYR!^(b(@P{*fvwNDDaeeBv}2T!x-RVP%gKtZai3c%3N5HD`L>H2@!_Z=%M zD*#MSPlvt}x)!%>TXbEQjfakuN+q%KF)5WwvhmOnUDw67ZD~RJm9Jx{s;XqOS=XLZ zzXU+}=q-;8kj-WZ0?`%V&&kHd#uy(TXLWTIl%wd^zUAa`2mALz$GFe{@Z_yDO`}lQ zDN-yJ0hm7WBLK&uUr{I&&@_$qZtV)7)p||SNT<`TztshRuWyXP+*z*NeHnmsI_*OE z>4NX8IFrdl05nZ=A?){mX6n=@Y@DjF7Jc6HoL_YWn5v&=->s8m_iG-1rBVSvThDsz zZgGF7j+Wq{ zdhcw<8XY?zTU!7;C@vE1J>c0hO_S6+moQD!%e@UdshJ7$bAvfb={rn_OHUSEO(vB zWFqY`y9Q{Ns;V+MISD-J!oYpapOp=V`# zyG~zU{|?Zd+rIPq>OgXMMEd*pdwh;#1JEkozMmW(5x)?=0BW@wwOTFoekc6_&AEx$ t!Y#N60000EWmrjOO-%qQ00008000000002eQ1J5t2J7JP*4ngkqX-CL!sz{V0{tNY6aVB zA2gIc6^l||Lc|AYTCma*!DPWS38~hU{&7>YY%sfYC$l@5*||Q%-8PNQ?zHiH8ScGv z&iU>+-#z!j142<0B@_yUwr^+^_hYZ#kC80PvZ|_TQ&UsZ*4Bq+0KOl+A>WTL$=a`+%(&f)N(k5FY9$E~2L3PK29Vr+4FDaRpTQ~40+7FQ4Oy0OO^df*-bUG};JU86>;!_rp!T@#j5!sLv*!o6 zd@+qvoF#0mz$wmh^Y;#LCBQTA9ZB-U+UkJW+{kD};NVl4^Q?AyQmr=WS) zUJ+|a08q@0;q(tNJ3US3x4$quJ&n^pL@_r8K&&M}^RB%Olc=lMm9Oj+Mr)FAq>0JV zaY9*{Q1lT>Bg1$%|Hiv=lSrZ+RnjPEC049TQ1L)rxq82KdF((v|8*~;;H46*g~`!z z#7qH2kD`WRL=x?{orGcl%*_;-937{rxq05M0W2w)Wc04$N`SkS(dw77KPaTyWPIc97Fh8F|GBZX~hH%={_13znHdHP@NpZ$ z?Zy;Iw9oH$DlO?ol1QSx;l}eo1e80Dn`LGeeAQ6wKebU0zDiKt;oUpE*Zi^*xR(H{ z!K>N$UkLQ|_SSm9?spC?B6i}-52{1awPS~`qgWTmdwPTrLgcbpkscfreZ9RRm(2=* zTsABEdV58Ba8Ts3Ss{cF$9sAjei1d4fxmJ&y1Tm<%v~HE1)%5Hu?1tl_y=p``d-Y5 R3BUjV002ovPDHLkV1k$iKDPh> literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Markers/job.rsi/urist.png b/Resources/Textures/ADT/Markers/job.rsi/urist.png new file mode 100644 index 0000000000000000000000000000000000000000..b113c2c99e86508df28169d543a4c7b4f0356d91 GIT binary patch literal 931 zcmV;U16=%xP){7wX<{U4qfY77f)g$HY#ls9eWUx@B4n=d!M|#_x%PoSR8f@ z=jZ1&{kf;7$F?8a!Btf?u5uWwVwrq;dRhwv0su&oMEP@nf4^mabyf{zSw@m1lTMN( zWLdWA3IL}aBV~GmrR5?3OTeajC-fe-1z;%ycL$GY?zdBXUoP_6-3!2LcQ4v{(atsil-?>Dk1;bFF?7*r)O3Gx=^Zn(5u))J z<=Oft06q25c#L#XF!Wx3kjclT^y_bb_-ZEr>7-yl)RKjoGLTLRsKT5BAR3PW(Bx_2 z%xJHXdR?yybB=P@e*zdeb%+NOLqx`}nDi-G1Ryw^FpYJIj9=lw#1JE=4pjxH*t6rO z`?Quo3w6#qGGda!7g@Tu?=j{t?0CZ1`@_aK_GykA`#m%VeXJGN_$qzn+?{6?V^qw* z+G^>tg99dSDNL#LOLmM zAbgZ`QZPY$PKfwgy)0+Gp=5Ja0jh4BeVto0fM@Rtj>fJ%MpYjOA2rsLx2G!1IYy7{ z)_|JMhl&gOI=5(D+cpCrd|Bm#|Af)wDOtqp4;ptUb;7!x1?7^GMdZA~%xnZXul&&k zR>amXnO*}w_XZ7L7hanHwleTPWy1lgegfgk>be40s@U>2gi_1>O}8!p?V%1Mkg8^J zI$cPMq9f26)QZIw8XG;v+K=&tn*G+)1?`~@&Esh{=~OiffF8VjzCF~T)e2D)K%r2e zP$<}*uOvSJ_g#g!i0v>b0000EWmrjOO-%qQ00008000000002eQ Date: Thu, 4 Jul 2024 13:52:15 +0300 Subject: [PATCH 22/75] =?UTF-8?q?=D0=BD=D0=B0=D0=B2=D0=B5=D1=80=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=B2=D1=81=D0=B5=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Storage/Closets/Lockers/lockers.yml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml index e14661372ae..15ffe143a85 100644 --- a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -1,3 +1,40 @@ +#Это нужно для того, чтобы в будущем, если кто-то решит добавить ещё наших шкафов, то их текстурки хранились в отдельной папке. +- type: entity + id: ADTClosetBase + parent: ClosetBase + name: closet + description: A standard-issue Nanotrasen storage unit. + abstract: true + components: + - type: Sprite + noRot: true + sprite: ADT/Structures/Storage/closet.rsi + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: EntityStorageVisuals + stateBaseClosed: generic + stateDoorOpen: generic_open + stateDoorClosed: generic_door + +# шкафы, которые можно разобрать и прочее. +- type: entity + id: ADTClosetSteelBase + parent: ADTClosetBase + components: + - type: Construction + graph: ClosetSteel + node: done + containers: + - entity_storage + - type: StaticPrice + price: 20 + # Biohazard - type: entity id: ADTClosetL3 From ce20a0d1210a9d6e328496fffe57d74f6f278bb2 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 4 Jul 2024 13:53:36 +0300 Subject: [PATCH 23/75] =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Storage/closet.rsi/bio_paramedic.png | Bin 0 -> 289 bytes .../Storage/closet.rsi/bio_paramedic_door.png | Bin 0 -> 429 bytes .../Storage/closet.rsi/bio_paramedic_open.png | Bin 0 -> 254 bytes .../Storage/closet.rsi/bio_pathologist.png | Bin 0 -> 291 bytes .../closet.rsi/bio_pathologist_door.png | Bin 0 -> 419 bytes .../closet.rsi/bio_pathologist_open.png | Bin 0 -> 254 bytes .../Storage/closet.rsi/blueshield.png | Bin 0 -> 730 bytes .../Storage/closet.rsi/blueshield_door.png | Bin 0 -> 845 bytes .../Storage/closet.rsi/blueshield_open.png | Bin 0 -> 696 bytes .../ADT/Structures/Storage/closet.rsi/cc.png | Bin 0 -> 735 bytes .../Structures/Storage/closet.rsi/cc_door.png | Bin 0 -> 830 bytes .../Structures/Storage/closet.rsi/cc_open.png | Bin 0 -> 720 bytes .../Structures/Storage/closet.rsi/generic.png | Bin 0 -> 215 bytes .../Storage/closet.rsi/generic_door.png | Bin 0 -> 206 bytes .../Storage/closet.rsi/generic_icon.png | Bin 0 -> 259 bytes .../Storage/closet.rsi/generic_open.png | Bin 0 -> 213 bytes .../Structures/Storage/closet.rsi/meta.json | 62 ++++++++++++++++++ .../Structures/Storage/closet.rsi/welded.png | Bin 0 -> 206 bytes 18 files changed, 62 insertions(+) create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png new file mode 100644 index 0000000000000000000000000000000000000000..9fb79da87ef1c2224763215f46c3052582983258 GIT binary patch literal 289 zcmV++0p9+JP)O15Hga1sX(U_){r1GQ%m0oT%9%>e2Q0Kk5iL#<*etKTo6uH^v7 zHE_Li4aaMWMhH-LK$#q@0O%?zMvnjhwANJ47(@5;eh6p4444Ms_BjpVAfUeS8WDiY z@(!@N36)affNAYO7>42i?>pcfU^Rl8eC0R;WLZY#+O~BANYhjt;Qb7E2Uv}us81uAh9L32`pug7_?%XURlf)ww00000NkvXXu0mjfZVh=v literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png new file mode 100644 index 0000000000000000000000000000000000000000..dc7d1924fad7d0fa5046116f2b7fb6f875f1b600 GIT binary patch literal 429 zcmV;e0aE^nP)lE(OWx7=$hX$AE}K7ND^OI zsyo^@$UWCZ1OPz0JH(E$yAbDdA_zH9M5m!~AvilkFMcUU!1pvQ%(uHka%~ahD;SR! z2W6Ib8X9-ux7uY$T>-ng2LSXM8h0R+uwP0*{qpq~ViEf;351FQ6=>1$eGq`1~gVJlBTRa(HaD9C)q`Rj)x&RD7kM5prNtRe7AZdtOAEBxDDKmvDY?Hq>)%o)>jP+JR-1=77lORYBzk XIOU1m$37V500000NkvXXu0mjfB|^3H literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png new file mode 100644 index 0000000000000000000000000000000000000000..70bd872400d9bbf3eba4b5d7bdf266a388f509c9 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJqn<8~ArY;~2@ALOGsb6_`bZ+SE`7U}e?9sBhPYc)=M0@!k zFfq8sXU4wge{VFSo#iUa1cieQ)(xz)A1IZ@Tg>*4n9SE1+pBnB8O> zwi+!;U)NyGaP!jqc>BxO8DEI)t19hG`^!+mz_8<*{ytZJ;c}pd7(8A5T-G@yGywpD C^ zhZS&pa1DoR^2!mQXn|t6w*sIosTe&10MJ@fxu$98p5lja0!)B$0Pd%29}Yw68?JEz z@LA#jtD8_M_QKpbE-g0kcu pn$7`%PVn3vtr`b9`3dy*`T`@2DQbbr59a^?002ovPDHLkV1k3}a?Ah# literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png new file mode 100644 index 0000000000000000000000000000000000000000..7c70b7a6484d462a30fad419916b7c7e0b82e9ca GIT binary patch literal 419 zcmV;U0bKrxP)X!q=fX4@pGB64W5Url*MELabHKHv4@$L-+x2P!f9Y8BUwgaY^>0@Qn#Q{^y z^ciwaU4-*tM~mAtb`^<>qao%_2Jy`hR?dRb1A=n&JKPR}94E7cxQs z7Tm6`t_&Ob#TYj7i!r#mx}wOD0!VTIEa-Rd-VNu&EZx0(H#{n6<^W`Xo(9MTBsl

xXb_m literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png new file mode 100644 index 0000000000000000000000000000000000000000..cacaa5ac9916a8655d1c856d51b0f71e3313fbd8 GIT binary patch literal 254 zcmVf~u~HkXJ914C>W?Hq8(B%0x6 zh(E)(H*aWW2|h63QNYB&z`$^E)?AzlXdNtN?LUu^(BFeK~Z&=ilbj?cDMbFA(ud zo2R3Xj#Rn_qR{m0y6^qaybC`&uKRuLx<4o2dxA@|=3kYZ#y>^hscC(O5Zr|GtD2VC zgNrTbezekdx-9u*dvzV&&Y*oBI&PtLv65BwoYMzLZOAXWf&Bv*ko&=D0TW3?K~z{r?N`AH!Y~YtB9;v)gRz4!FaC@N z58`Kf5)UHc5BLT9g2BLfkR61bbm{DErO83UpoKw6USD3*lx6_JV?vFul=@Jyh-=%H z#7zQW@GQ$r{Nw2i``s4e)v2kjYm$hmlfmIgbZk8HeCkK`abOKl21x)GU{Mr??{d4FdGb8K>(SeW0^ypnEQefto7Nhy zAnW_B@dhJhz_N6tUP1&kO+&&VNW2JxfRF+441{Yaegr{)cm`Ov!1e^bmxl8Uk1GSV zDe+~1<7XYgKl%ZdfGCPMntN?LUu^(BFeK~Z&=ilbj?cDMbFA(ud zo2R3Xj#Rn_qR{m0y6^qaybC`&uKRuLx<4o2dxA@|=3kYZ#y>^hscC(O5Zr|GtD2VC zgNrTbezekdx-9u*dvzV&&Y*oBI&PtLv65BwoYMzLZOAXWf&Bv*ko&=D0ftFLK~z{r?N!}M!%z&4q8m&o1II+@6ZBpm zq7NeYM1n6NUfA2->l=ta7goeEXDL{)1M5j3bHp5$t{0*6|}j+ z%mkLJ&#z7vBrrbi$!|s8#kP46vCMcA6+jYfud^Avl_l&91~C6{%9zUnXmIqaCaHk6 zTJ79g1f&8O7^`2$%w4cI9@qTnWFpV#HN|eMK$@nMA64Mj?phS^4~Wr`l^nh6#srol z{fSA~De$`$;I@?Lee%kNc@*Pa9LIT45?0wAVOuj3c%DpXuw36f*7&<0WQ1)A{P_J( Xk(aNiOWJ}-00000NkvXXu0mjfXg!K` literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png new file mode 100644 index 0000000000000000000000000000000000000000..fa74babe4bc3822616da41c54e642a1ce1c5a850 GIT binary patch literal 696 zcmV;p0!RIcP)tN?LUu^(BFeK~Z&=ilbj?cDMbFA(ud zo2R3Xj#Rn_qR{m0y6^qaybC`&uKRuLx<4o2dxA@|=3kYZ#y>^hscC(O5Zr|GtD2VC zgNrTbezekdx-9u*dvzV&&Y*oBI&PtLv65BwoYMzLZOAXWf&Bv*ko&=uvG~MMZz#|ZR9|j=${ZBmt z0SLadEpXW#Krp)lxKhf2)Gh>Dkj()sG*0W0892aE_3^1X#sTho5P;TG@YF>J0v_W? zu~}ju;M_DUFbVMdiX8SV2^{D18jt9m!h$QZNbNt?|DMHmB} ebIJY#Vl^*%2UtG%K>Vlx0000v7U^nH2n`S88>`|#ZNz!S;prqezPX0BjI!y*6j%BsKf zjUL%Pf{bdqV=cty8VxP!t zhszxpe6loKt4dxuo>U6n&!Kk(`tP87t(H~&J!g*)-;!T+3kQcVD);-=e*t93XgHoK zkzxP<010qNS#tmY4#WTe4#WYKD-Ig~009?CL_t(oM`K_ZV8BSM{YsJI|A|!#Qg?6p zOQOssN)gC%0a1Ri{l_A-8LU=Zh10kk_2KnLq8!15%K&2V~kP8<6|NhEP zf`%b05Y%C3c(nE{LGy_U0hqz!W{_wgP)v7U^nH2n`S88>`|#ZNz!S;prqezPX0BjI!y*6j%BsKf zjUL%Pf{bdqV=cty8VxP!t zhszxpe6loKt4dxuo>U6n&!Kk(`tP87t(H~&J!g*)-;!T+3kQcVD);-=e*t93XgHoK zkzxP<010qNS#tmY4#WTe4#WYKD-Ig~00DMML_t(oM`K_Z1*0J_8UiCd1Q>}80F_vU z|H>Lt3_Cm(89cV%htt^fzkd0K;oPKKM48Qk%>Zm-Aj?4p|NJ42LSs`aDlP&PzJ*N+ zLyQSS1c$)g8_zIgAQmw&pwl3S5(|iS05$_}U%3kwMyIi<#U)0O15|aC!RDgVxGcja zPLTu9eGcPevj~?MMGipsIgF3XGHl`$Ie;1=KvZ4@xg1mu@CmYE^8`E>AWQD7K1P(; zM3)1|mLH4I2HRz|;wqRXCEKC3`&vW3{Td7 zW{?TwMYjhhpQ1E?(^L{9NOl0o_n=UKMFY$(knhO>L`MO#;pkED`rKEzG`l<#12UhG zqeu<`n9o5ptPZe>(_>I|mtug?;%1=Ah&Vv91CWiSMma!{1BOLOI2r;Jg@Ax4KR8XI z)5N8Jh$@oG0Z?(gfAa$dWSSJqsG_#VUFko_AQ(**LkH3j0M?(7vdpb7Z2$lO07*qo IM6N<$f&vj}{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b99850e38b22a13e665d066f6d81f64361910d79 GIT binary patch literal 720 zcmV;>0x$iEP)v7U^nH2n`S88>`|#ZNz!S;prqezPX0BjI!y*6j%BsKf zjUL%Pf{bdqV=cty8VxP!t zhszxpe6loKt4dxuo>U6n&!Kk(`tP87t(H~&J!g*)-;!T+3kQcVD);-=e*t93XgHoK zkzxP<010qNS#tmY4#WTe4#WYKD-Ig~009U|L_t(oM`K_Z1*0J_8Uh0x0*u(~mkSpD zk1YOZ?OUwsu<0dLj0N2?kO7)T>L}(sT6>ICbBR{Zg3ZFakDtN~P?nV@+Awkyf*k+? z$d>+k{RJ$>Cdvbqr5y!#0LTiM#qY2D1luU?NM{GYEEd#Zr=6G4OhyR-n8kDtf!8nJ zfZc^H1YmNs3X;JQ0x;hpf?k+b9>y>iB?QDB>1Q#_B}^DjqO$a_lUJo2hzSOOk2l@YzNAjsq3M2K!7E&BoJ#RUK?a9gNdJ@IM)0000ViyXyb=-^#1on#RyPO;n6WWA@8a&*!O*De$+T#p zgFuJBgAOl;kf+cA4t^fzqo*4eOi*DgagJ2HD9~W4$iQ&$pv7zNMF)9+HZgd*`njxg HN@xNAfu=q2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png new file mode 100644 index 0000000000000000000000000000000000000000..26498527779b4d6a73aae5d90c336bfffa1a1410 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0F7ZDJdf(qpYm#;NTDt z5D*>`l9-T?k)EEPpI=;DTv=J!*wFC3pz|_NDPu{HUoeBivm0qZPN=7gV~EE2Ef((HlEMJ!%{2~RkfWgz%&t;ucLK6UwoItz) literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2487eae1fdd11637cf11455e45b2431fe0690488 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|)B}7%T!FNP zhK9bLo|ToAjg5_?qoa$9OF%$CMtXXFettngK|@1BV?#s4`KddAN_k6y{DK+&BLQ6& z$F)F-LQfaR5R2ZkmrimWP~dS5WLNQ={r~?xt)ml;dcR$E`0kDm3Q|5V>u$1suiPxr zY2NU{?$SJkfbP{y0WP|l92(JFjRvQ8Jd98-==;d@=V6N^+cw`T3JT0K<=9tSmk2dl rwhNr`tgAfqNK}ty*8gw34GWkjN^+I6m~nLhEobm_^>bP0l+XkKq_VS)S0JsTqN1UpVP$3I;o%Vw z5D*>`lAoX7*wB!bHRU!?nz1CvFPOpM*^M+HC&SalF+}5ha)N}$fh9{C&V&YCdXeEE zcHu>ax3j2+w;7Ny69Ez;Y73lXS1e+1Wmv%!st~Bd8>*n&+t6SXpwMW-Xu80GVN-+F zh2j-V4($uM80Px5aj}PpE=pXX<OIQ< literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json new file mode 100644 index 00000000000..8428625de70 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from tgstation. Bio Pathologist and Paramedic made by JustKekc. Central Command (cc) and blueshield made by Tamioki.", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "generic_icon" + }, + { + "name": "welded" + }, + { + "name": "cc" + }, + { + "name": "cc_door" + }, + { + "name": "cc_open" + }, + { + "name": "blueshield" + }, + { + "name": "blueshield_door" + }, + { + "name": "blueshield_open" + }, + { + "name": "bio_pathologist" + }, + { + "name": "bio_pathologist_door" + }, + { + "name": "bio_pathologist_open" + }, + { + "name": "bio_paramedic" + }, + { + "name": "bio_paramedic_door" + }, + { + "name": "bio_paramedic_open" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..5ba5dcc89629b486b489f8afc2a0ac2ed366c27f GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0L@+;Narq6c7*)92^`T z5|WsZkddCApPye-QPJ4Y(AU*9dGh2BpB4T9l`@tD`2{mLJiCzwph#_&!%v3oMt;US#13y~q-w%fThFV0PoW zMG-=G^~G9b!ZJJ64yPX> literal 0 HcmV?d00001 From 355bbf2b73902405ba0e61fbccf7976b89c07e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 13 Jul 2024 10:54:30 +0300 Subject: [PATCH 24/75] Fix YAML linter? --- Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index a06dc14df77..d202f149022 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -6,4 +6,5 @@ - type: StorageFill contents: - id: ADTClothingOuterBioPathologist - - id: ADTClothingHeadHatHoodBioPathologist \ No newline at end of file + - id: ADTClothingHeadHatHoodBioPathologist + From feac2382aa3c6c74db86d8fc641bf1c0a7934e11 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 13 Jul 2024 11:05:41 +0300 Subject: [PATCH 25/75] test --- Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index d202f149022..47224cbe859 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,7 +1,7 @@ - type: entity - id: ADTClosetL3PathologistFilled + suffix: Filled, Pathologist - parent: ADTClosetL3Pathologist + components: - type: StorageFill contents: From aab1e655ba54e6fbbb797eaf87b3e8ed4cbdc223 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 13 Jul 2024 11:08:32 +0300 Subject: [PATCH 26/75] Fix YAML? --- Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index 47224cbe859..b904061c772 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,7 +1,7 @@ - type: entity - + parent: ADTClosetL3Pathologist + id: ADTClosetL3PathologistFilled suffix: Filled, Pathologist - components: - type: StorageFill contents: From 7310d91478f91269dc6a337eef90bbd23652e27a Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 13 Jul 2024 11:19:44 +0300 Subject: [PATCH 27/75] =?UTF-8?q?=D0=B2=D0=BE=D1=82=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=20=D0=B1=D1=8B=D1=82=D1=8C=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20YAMLa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Structures/Storage/Closets/Lockers/lockers.yml | 2 +- .../prototypes/adt/catalog/fills/lockers/biohazard.ftl | 4 ++-- Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 15ffe143a85..431e985b40e 100644 --- a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -46,7 +46,7 @@ # Патолог. - type: entity - id: ADTClosetL3Pathologist + id: ADTClosetLPathologist parent: ADTClosetL3 components: - type: Appearance diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl index c8296fd1be8..2ce0b2dddaf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl @@ -1,10 +1,10 @@ ent-ADTClosetL3 = шкаф снаряжения 3-го уровня биологической опасности .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. -ent-ADTClosetL3Pathologist = шкаф снаряжения 3-го уровня биологической опасности +ent-ADTClosetLPathologist = шкаф снаряжения 3-го уровня биологической опасности .suffix = Пустой, Патологоанатом .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. -ent-ADTClosetL3PathologistFilled = шкаф снаряжения 3-го уровня биологической опасности +ent-ADTClosetLPathologistFilled = шкаф снаряжения 3-го уровня биологической опасности .suffix = Заполненный, Патологоанатом .desc = Это хранилище для снаряжения 3-го уровня биологической опасности. diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index b904061c772..4b36638b4b6 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,6 +1,6 @@ - type: entity - parent: ADTClosetL3Pathologist - id: ADTClosetL3PathologistFilled + parent: ADTClosetLPathologist + id: ADTClosetLPathologistFilled suffix: Filled, Pathologist components: - type: StorageFill From 85cc1308d117996d3839c65678d0f2233fd17b3d Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 13 Jul 2024 11:38:41 +0300 Subject: [PATCH 28/75] =?UTF-8?q?=D0=B0=20=D0=B5=D1=81=D0=BB=D0=B8=20?= =?UTF-8?q?=D1=82=D0=B0=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Structures/Storage/Closets/Lockers/lockers.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 431e985b40e..db9b67b5bfb 100644 --- a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -1,7 +1,7 @@ #Это нужно для того, чтобы в будущем, если кто-то решит добавить ещё наших шкафов, то их текстурки хранились в отдельной папке. - type: entity - id: ADTClosetBase parent: ClosetBase + id: ADTClosetBase name: closet description: A standard-issue Nanotrasen storage unit. abstract: true @@ -24,8 +24,8 @@ # шкафы, которые можно разобрать и прочее. - type: entity - id: ADTClosetSteelBase parent: ADTClosetBase + id: ADTClosetSteelBase components: - type: Construction graph: ClosetSteel @@ -37,8 +37,8 @@ # Biohazard - type: entity - id: ADTClosetL3 parent: ADTClosetSteelBase + id: ADTClosetL3 name: level 3 biohazard gear closet description: It's a storage unit for level 3 biohazard gear. components: @@ -46,8 +46,8 @@ # Патолог. - type: entity - id: ADTClosetLPathologist parent: ADTClosetL3 + id: ADTClosetLPathologist components: - type: Appearance - type: EntityStorageVisuals From 77d64a0cd3f7dbc93e4d3c0670c551f03d10f978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 13 Jul 2024 12:02:33 +0300 Subject: [PATCH 29/75] Rename Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml to Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml --- .../Entities/Structures/Storage/Closets/Lockers }/lockers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Resources/{Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers => Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers }/lockers.yml (97%) diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml similarity index 97% rename from Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml rename to Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml index db9b67b5bfb..9bfb87bb294 100644 --- a/Resources/Locale/ru-RU/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml @@ -53,4 +53,4 @@ - type: EntityStorageVisuals stateBaseClosed: bio_pathologist stateDoorOpen: bio_pathologist_open - stateDoorClosed: bio_pathologist_door \ No newline at end of file + stateDoorClosed: bio_pathologist_door From da87dfc50681d64c7276b67df5053a5b28bda750 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:41:32 +0300 Subject: [PATCH 30/75] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=20=D0=BD=D0=BE=D1=81=D0=BA=D0=BE=D0=B2=20pathologist.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml index 098a62b2934..7abd15d5d9b 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml @@ -25,9 +25,9 @@ ears: ClothingHeadsetMedical belt: BoxFolderClipboard underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear - socks: ClothingUnderwearSocksNormal + # socks: ClothingUnderwearSocksNormal # До добавления слота носков underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear innerClothingSkirt: ADTClothingUniformPathologistSkirt satchel: ADTClothingBackpackSatchelPathologistFilled - duffelbag: ADTClothingBackpackDuffelPathologistFilled \ No newline at end of file + duffelbag: ADTClothingBackpackDuffelPathologistFilled From 2b81dac34d3210880a74c45d18d027e8956d3439 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:04:38 +0300 Subject: [PATCH 31/75] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D1=8B(=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B0=20=D0=BD=D0=B5=20=D0=B2=20=D1=8D=D1=82=D0=BE?= =?UTF-8?q?=D0=BC)=20pathologist.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml index 7abd15d5d9b..e85d069620a 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml @@ -25,7 +25,7 @@ ears: ClothingHeadsetMedical belt: BoxFolderClipboard underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear - # socks: ClothingUnderwearSocksNormal # До добавления слота носков + socks: ClothingUnderwearSocksNormal underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear innerClothingSkirt: ADTClothingUniformPathologistSkirt From e2a998fa588819e916be68a0528d08fb4e973fe9 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:21:06 +0300 Subject: [PATCH 32/75] Update misc.yml --- .../Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml index dd4bd9a5b4c..c70a9d0e556 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml @@ -29,7 +29,7 @@ tags: - Document - Trash - - socks + #- socks До добавления носков - type: Appearance - type: PaperVisuals - type: GuideHelp @@ -61,4 +61,4 @@ Cardboard: 50 - type: GuideHelp guides: - - ADTPathologist \ No newline at end of file + - ADTPathologist From 612fa324f9a41ac08dff894a03dd25b038d5cc33 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:36:16 +0300 Subject: [PATCH 33/75] =?UTF-8?q?fuck=20u,=20=D0=B0=20=D1=82=D0=B0=D0=BA?= =?UTF-8?q?=20=D1=82=D1=8B=20=D0=B1=D1=83=D0=B4=D0=B5=D1=88=D1=8C=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B4=D0=B0=D0=B2=D0=B0=D0=B2=D1=82=D1=8C=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D1=83=3F!=20misc.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml index c70a9d0e556..1c18bc78963 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml @@ -29,7 +29,6 @@ tags: - Document - Trash - #- socks До добавления носков - type: Appearance - type: PaperVisuals - type: GuideHelp From 8ca108c40cb54184e305f5d4a69b26bbc06006d7 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 18:57:47 +0000 Subject: [PATCH 34/75] lf --- .../Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml index 1c18bc78963..099d93f2a1b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml @@ -29,6 +29,7 @@ tags: - Document - Trash + # - socks - type: Appearance - type: PaperVisuals - type: GuideHelp From feaffbc360eb441f628107e53e4c12a0e4b91341 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:06:40 +0000 Subject: [PATCH 35/75] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B8=D1=82=D1=8C=20=D0=BF=D0=BE=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=20fuck=20=D0=BD=D0=BE=D1=81=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specific/Medical/misc.yml | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml index 099d93f2a1b..2d1a5ac23b4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml @@ -1,64 +1,64 @@ -- type: entity - name: foot tag - parent: BaseItem - id: ADTFootTag - description: A piece of paper for dead. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/foot_tag - layers: - - state: paper - - state: paper_words - map: ["enum.PaperVisualLayers.Writing"] - visible: false - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/foot_tag - slots: [socks] - quickEquip: false - - type: Paper - - type: ActivatableUI - key: enum.PaperUiKey.Key - closeOnHandDeselect: false - - type: UserInterface - interfaces: - - key: enum.PaperUiKey.Key - type: PaperBoundUserInterface - - type: Item - size: Tiny - - type: Tag - tags: - - Document - - Trash - # - socks - - type: Appearance - - type: PaperVisuals - - type: GuideHelp - guides: - - ADTPathologist +#- type: entity +# name: foot tag +# parent: BaseItem +# id: ADTFootTag +# description: A piece of paper for dead. +# components: +# - type: Sprite +# sprite: ADT/Clothing/Shoes/Boots/foot_tag +# layers: +# - state: paper +# - state: paper_words +# map: ["enum.PaperVisualLayers.Writing"] +# visible: false +# - type: Clothing +# sprite: ADT/Clothing/Shoes/Boots/foot_tag +# slots: [socks] +# quickEquip: false +# - type: Paper +# - type: ActivatableUI +# key: enum.PaperUiKey.Key +# closeOnHandDeselect: false +# - type: UserInterface +# interfaces: +# - key: enum.PaperUiKey.Key +# type: PaperBoundUserInterface +# - type: Item +# size: Tiny +# - type: Tag +# tags: +# - Document +# - Trash +# # - socks +# - type: Appearance +# - type: PaperVisuals +# - type: GuideHelp +# guides: +# - ADTPathologist -- type: entity - name: box of foot tags - parent: BoxCardboard - id: ADTFootTagBox - description: It's plastic a box with foot tags inside. - components: - - type: Storage - maxItemSize: Small - grid: - - 0,0,2,1 - - type: StorageFill - contents: - - id: ADTFootTag - amount: 6 - - type: Sprite - sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi - state: icon - - type: Item - sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi - size: Normal - - type: PhysicalComposition - materialComposition: - Cardboard: 50 - - type: GuideHelp - guides: - - ADTPathologist +#- type: entity +# name: box of foot tags +# parent: BoxCardboard +# id: ADTFootTagBox +# description: It's plastic a box with foot tags inside. +# components: +# - type: Storage +# maxItemSize: Small +# grid: +# - 0,0,2,1 +# - type: StorageFill +# contents: +# - id: ADTFootTag +# amount: 6 +# - type: Sprite +# sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi +# state: icon +# - type: Item +# sprite: ADT/Objects/Specific/Medical/foot-tag-box.rsi +# size: Normal +# - type: PhysicalComposition +# materialComposition: +# Cardboard: 50 +# - type: GuideHelp +# guides: +# - ADTPathologist From a596498c71d608f916d5e4fc6b73bb207a67f287 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:15:58 +0000 Subject: [PATCH 36/75] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B8=D0=BB=D0=B8=20=D0=BD=D0=B5=D1=82,=20=D0=B2?= =?UTF-8?q?=D0=BE=D1=82=20=D0=B2=20=D1=87=D0=B5=D0=BC=20=D0=B2=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 341c606f518..6d2ba1fb9dd 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -6,5 +6,7 @@ components: - type: Sprite sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi + state: icon - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi + state: equipped-OUTERCLOTHING From 1c94032ea4fad050e727dd0d850c52588af90c04 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:53:58 +0000 Subject: [PATCH 37/75] =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=D1=8B=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Misc/id_cards.rsi/default-inhand-left.png | Bin 0 -> 177 bytes .../id_cards.rsi/default-inhand-right.png | Bin 0 -> 179 bytes .../ADT/Objects/Misc/id_cards.rsi/default.png | Bin 0 -> 355 bytes .../Misc/id_cards.rsi/id-pathologist.png | Bin 0 -> 195 bytes .../ADT/Objects/Misc/id_cards.rsi/meta.json | 25 ++++++++++++++++++ 5 files changed, 25 insertions(+) create mode 100644 Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png create mode 100644 Resources/Textures/ADT/Objects/Misc/id_cards.rsi/id-pathologist.png create mode 100644 Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f7848f63f6a3f7bd57aa4fd8430f34fe515f8f04 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6`n4RAr*7p-ZJDpV8Fw2z(}(} z$nbp5(;%OhA}nvcJB!#4{Q5pY)s7FSmf^wbRj-WCcYC$QCUJ&dy?s~7@%G(cSG*;j zu7CcfzRmY+uSBA7{(&z~+t=O)DF=cRw|?Eu`Tc2Sb<0cLQu7I$uH1Dvb?qtRgW2MO Wy`l3x=dP{=sq%F7b6Mw<&;$UHibqTU literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..82b5598806de72b5cd2ed0cb65cee99adbb58df8 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Rh}-6Ar*7p-rC69V8Fw2AmW3y++4=+d%hUb*TI&yrtXKQRQ{ YXFb^-I$!GNix(h8p00i_>zopr0QOu&O#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..95b3d54c270091387e888743faf2d53d147acbfd GIT binary patch literal 355 zcmV-p0i6DcP)Px$9Z5t%R9J=Wm9cGvFcgOWL>VNqSimg{q+x_BXhf<0) z@xnDt({wkl>w0q!5d|60T0SielL0c$O?EDNy6^ZxpI6?(hi zW7yW8_nOPHWEW2;%~+usE1X*Ctp|OABRonViUA=60Khr-JzvJnSOEae?HRz!sahymb5?>HQjdrpfuUY^A002ovPDHLkV1hb- Bj{X1u literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/id-pathologist.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/id-pathologist.png new file mode 100644 index 0000000000000000000000000000000000000000..a4793b60469bd433c60c50b00f69ce96bcae8aba GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJE>9Q7kcigg1PRu~2_ijB6Zs@M zLp5g2_$wd#=Ifu8F0YrLU|iIB^Z!m)SHmOw_tp7sRG#5+^+WbwRj)UT&oCOCUip$^ zlFR|I741%!?=oK5Hb;j&K$@q*Oor8kbzw*Sm-`6RzH4iin&+hf+oaJ94)AhqW pc?n}pgT!g~gBoCK4S;}wL3oO?z|%(aNT912JYD@<);T3K0RU+tN5}vG literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json new file mode 100644 index 00000000000..f8b4aa32c54 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, pathologist made by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "default" + }, + { + "name": "id-pathologist" + }, + { + "name": "default-inhand-left", + "directions": 4 + }, + { + "name": "default-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file From 75024413732f2fbf45c6f03fdce2e3d36a08ea51 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:03:54 +0000 Subject: [PATCH 38/75] =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=D1=8B=20=D0=B2=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patholodrobe.rsi/broken.png | Bin 0 -> 885 bytes .../patholodrobe.rsi/meta.json | 33 ++++++++++++++++++ .../patholodrobe.rsi/normal-unshaded.png | Bin 0 -> 15328 bytes .../VendingMachines/patholodrobe.rsi/off.png | Bin 0 -> 557 bytes .../patholodrobe.rsi/panel.png | Bin 0 -> 190 bytes 5 files changed, 33 insertions(+) create mode 100644 Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/broken.png create mode 100644 Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/off.png create mode 100644 Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/panel.png diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..cb3f5e45c2a3676fb30e86a6699857f8b272b44f GIT binary patch literal 885 zcmV-*1B(2KP)Qe?d4!_$Rcemh}&`bWsB>TPX>(>lZ>f zO=J?5n=l+fF^y8h0-MjZ@9=uQJM+wG(Si5Qx#ygF&-Z-qy^mLA5pw9nm37?T=HA)f z=Hn3=eiw6)sCl2?-mMDHtPVRgZf-kf)wT7uIQ`5HTG? zH8k!w#%Pz{(p-$SCt6&r=m;5+0Juurg30lhwpzWbIE7O^IX+z+%b1(lu+UNYtflLz zInt2;6kN#8^D5I0MPcSz`(@Bgmrdyx*`-u zC;|uosCYV^cA$uN98I7KQs>^Kw!nJ}#DH6&@S-SP!vvt{n4;>Oyks)z(x*Orw5NA! zEq!L$jl*j>=kJ%70VP2zMPPx#VnlJYn9(+c83^WvZ7%~#q;on|VSogMSSFKkE^?7D z1J3Drm1Tf=>WuwH*b3Pc2b4fySCjz`8x#jSg$)V{7@*iH9%2<|fC7j>=(_13!idfR zv5GRVQF?=R*%V_7L_I8t4bDMD8PLIkS{^!7=VC>-L;x$!0EOw6EkFRl8Bphp$&pl) z0d)=S?6m|ybS?oL+W=!*VW8|aq`RPmuODN8!HDEs>a;VT)roAAo*|2-L1Xu zhh%AXY*W2h4D|L~w3&Q90u5pR0@Bb-Vz4ztP^6{@1`S$E=PSu}zz=00000 LNkvXXu0mjfcsQik literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json new file mode 100644 index 00000000000..7a99d3e9b02 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by JustKekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.1, + 1.0, + 0.1, + 1.0, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..d8191578f197ce87198d56d173b5b059a81bc981 GIT binary patch literal 15328 zcmeHtRd5_zvTci*nOn@v%#0SJr4}A9Xm=zNg4?rA07YzAj!%|sJ@+z-o7HR&~Lwo9L~r90ByUs zy0)t-$OGu;>|kzXYX)@nax?>)d0LqR0G?|l*;c6pyvfzCCRojolLO8yxi{{!6PK6$ zctvClYPZF7vUn7mM1iYBh|rlY!mpR?L4f6FX==!#E){5|O zT$@il*Ry;kcHvgAlZUf$2Hw>ZK4<+P5L%ztv%D^IdJ|A2Z2a=L67cK+`l-1m)b~WB zU-$e~+>aP|^12o3|5_kS;NVL7-Qi^}@0%Md)j_G3_v@l(VUcv4aQD}Viq6-wb?Yw0 zpoebVFFjl6-HOisuTLX+1Zmw}s9Tqp!rQz{%RSG_dEA$0Hxk?ChOfdFi!LLRG~Sa6 zZvIH8c9D06oequ&o9+0-jO+cc7-=+j9{V1Y71RZF=S?Bo^PI;zHT#8nH68muUwqof z$fbJXsFgeK<|Cd4@S`34p{orS96WsC7^_rt*2fxP{7<*@hBnu^_@}z`4yPx+YhJdc ztLZ;qINY?7@JN^MWFIx$@oNdB-DTPmi_@11dlAs@P1~r>=j^m@ZwFWzK+vaiOvoh- z55^y(lYd5`fb}SVa8P)DImo9!a|8PnsYgvb45b;UK~Ara&GWEFh@qpCKV9^M`eFp7 zFX#U~Q7Al7C+pPBMo4wTuTnXeguov;y&j$RKt($Xn=b~-gv?*AYEVU)bm)Vs66NB8 z>I~^fw(~S40;UffWoEJ*Q^~@dTy4Q{rgcrp(wenHHFbP&$70q62Vb+9 zvUOwiuFhVH{Xs>ad`z0MWXoHPOOM-n^R=zDnf;f}yXuYC<@OBpo~o=@2d!z#ufLoR zf9bd8Y1+Ys92?YABXE{;CHi%CODn^u@-`mjqFgdRf3}?%xH9d)Lf<94^d{)^Vq8)= z$!R;G1(krexDrRg;Fh$tMbEHe2HJ)LgYmyOX8Fzi>?(1w{_es&i%w>Ov^NSmK6huV zWVf$ILtzh|kJDWJ`D^Ocnaw8@!v4rzNww(`HYewkr%|0Sv95WKGyi5J#6! z1nU8wT881Z)b8O06Dv8|)m9mbBp$Z9bG!o$7R9P-$Qw(M4pC~*?gDvaI_PD+zK%gU zy37_>xJFAFe0?h^b~`iiA6q+8-C>%1bH=KU@KM_1b07_nT2lLjTe2dc>?~N4K<$I# zx~)1%Dr!1W2Uol2brs(@z*-tBr%Xy0l!3*CwK=b>!mBx%UeRA4N0HiyVvMT0ka5mh z*i*h-06CUisoffng|4uyvZ87^wagabFboME&eh0$I%7IZV>Q5&#?CKUT93%&)+`XLz~6gKt#-&(#U!}ZQy3wnKmjHX>`gEEaKNNj z*aJp$PCZ;f4c7o=L$gr*l-x0MCJBYh&S^ZMk4NK^3ig6I8k-@c+of)kT40AM^BY5~ z&G z5a-P;46AW3JaPu%KhaRbyN_i|mqzkA7qrbqe9vD7WN9^pYHkV)sTzN+KS#fAA>c2+ zEI;Vv6@lcYts%%}J?Kuz_)3;!X0$^w?ph3c?!9onwfd^2UfOgSz zq!rntnw-<2ksGNm=pSSNH`gu?_F2eN5SRC4@v#Ll1VL0~(+2AJRZ!e7Os!8bn8Grg zK8+RwJ?aJbWayH!1HrAf1*gxj{fJ6eGA&olvEF%++|qy0W{_CNHFB91SNdE=7=XXy zP#p|q3fGta4B7BpZh$jsB~T8J9uyqwRDuR%2|tZ28IZ>vQ0C_kh$+Iz1lcV;QNG%OqL0B5{ zH#M&bkUxPQiYMC6lH&wV^h6|S2OxPrePfYRVONr>Z(gAt?8J}@JMbHg&{?nB(8dlY zOHyK=QF^-3|ti{p`cJijFWc|fgfYXi`XO*os9^lU~3jQEJBw#FlPd5nG6;) z+prHIvCtPt_hLacDu{8h;J=uTzYu#VoH0%djmAhXw}k^5lvvl&0n>;7y^{H20e8F@OytTtEp=T=AhU?hb>xbY z)DE1fK0fiCtkbS*yna>&Bu;$Yh;ojEZNLU;Bo)JG1)0^@n@Q$EVF6yM0C^x5zvq-b zj30g@FcUV!iP}&Tisl-Tn3x0=%cQLNzlPy8tTLfS`#Q^tRx{C)o5!oDM0dr?3&_J| zhlWhjp{8_b(}u~?y5RJinDHT0E+*-3M8f$}VXXz`+|EMzo8n{+q!CI~l~@HRyhW7n zeiq&3<(J+M-G8|cx!RSL@iNEjJ`1F#fXcy^aQqxSb?a3C7!})&%)!ld@jB=%t^p0I z!|2P;l0kVI3!Vp!KU6LeM@Baw+72DF^_NmIAi!g9A{&9u{RRgyYUHa_2&!0gibZ|R z%gRgvcy7&s$_K3=>ptpGfGA;`NHBx$ikrbEUxwqIlRPZAu|Z@Z8i-D`@iX3n zFhZ~>UM0Xggv#^TK-aZEDoZF^ZRDdNz(aK5&Bt2#B*`Jmn`!(3C(~1&mS^WX3S<(AJ1WG;Qf`fyf$V0P@&m zI|4p)+VugH<{Um8Ci!S1p3C)SVDiBGQuq-8Vxqc|;{1<@@%=I`jlRK~KtO*tpm7T{ zgJn{08V~Xc4SV4HA)wT5%>Z#h3RJVGh%D*?Uay_wTFwK$V-O5Z;ky`7-&>Mdo=O<> zTS?}Elm*bjw|6?D_BZyQ8r`9OB)f&v!PsPKcZGkoXvR?v>8IkAI!iha1P_v3D3&FF zjuHAK30N6MuM#Idq|_QokuPC&HLi4TfbhN{(xo^%JpDeN3&&evM7k59(Cw(zCPiij z8U(6-Wf#FprXZ7=JdqazNXMu#KT7mrDwe^BozCY^HA++F8SRv2tu=bn$n$wsY zuXOPfcn?d&;}X%g1BOW!6?`q+%48Kp;!JKJ^San6uDc!k%Bg$jKz=u~2dh)dBTckP z&5M}c;ej`-RA=NDm=ZQ1;Z`)JUCtW%ZqyOh1%HZ8n+e(+ow6$5Y*G6#*Im+ug~pOr zb|V?xE;)0D05Tm}mkj4vPhqUg)q-DPu82-i~ z3Khrn*!7pD&h^@NAKu=2PcN`LwFdBB4xtElH8G|lfrk;TuXfK`MQWH zagM+$nkVIl;azE2KvV*~Ahrsq1cJ`HaDyypk3QAtTlGMDLLa4uHb8KC*tckhX|g^s zq99o>s|-MblZif5OE?{hj*^=eK#$FYg30Bs08hD5PsSE=7oJWvF#>C2v2Tf@_gsohfKE1d4U2bS0TtANbRP`o+p&9 zV4N=s69jA-aI{5SsJh7+`RT1<8whkq9a+$~eIC98P$?RX0=+{;Rrfl~+aGeQjrtj5 zF%Y%u&rSp%2(W2o<_%PlJy_?%^>>1}4vq!o!WRcZ?zdpo?+3u!s^TXDMFAdI)_L%7 z>WD7N%ak91!%{Wis*xYF(fsSQHSpQ?iRhz0%>mHD!3x4sOaYk~LS@mE3$YABN?GhO zEixM-k`-Ev1iLnaFm*yE;qEz20ggUK@uW)mT;!dyg=k-bU}`_%lc7g6PXG(Xaj=Oq zd_(KM3w_M5B*VjrWHnf?^E~Jg2e5Mk^5X8%7{srzXY~9+N6CNKu~tY_D8SAeb5G9= z^NAwem!}3@OJgVV02IGn6CE(7hoaS092RCZa5;q8UiT`RDHIU1G|B)pr+76xgA)nz zV59()(%<-_cwdqtD8)6#wC5@zn#H+9E3iNfyXrJ8Nln@c*PWuPaGwj3tu#eJSe6i> zD;0@1k-W`aa^7+^3KN-X2!^7R&hv3!+wc_hVyQ>5zOgl?$RG*YmXvQR5XXmfczc$MaqXS{E_yMyuLVF2cy7UQZ^5CTGGWa;wRlft?S!tF?%xx0g#W zWD$5Ai_{ps7HjWCpE1ygWVOqAP4+|={tSHg#dHuHH0(xH)~Am%-$t)`)2=UJqOxf( z*Axp2EqU!C1~X_t0i#hhU4@$pp_3X_#JCQdxz`Xg$kvC0z+@(7@IJ3{zQfP4n$6^M z%pi5y*C1}}FJmQJ7Jqg(r?A;@6UF#x^!%p)_8~#3&I+ z*beH9S$oA~56m8d#E>$po_5AX;kdcc6k6*EZrrzFQ5B2CSiRQXJjjFh{U1=0{8xTB z=v!@#s`^1!ST}E5={8dc;P8H^J8ctFF`n9GjSCr-+Bb*^$P0>)-OEuQK)VgPnYDbm zp)8y2&s@l87Tz-8*m`~9RL3<+mhfU0T0yBgCh}veP zPH5747vPF%;>~YVt*pV;u|XJEV_JzNn>+ zP<~DZHG^>)t1Rk2m}eqTzv}Be!JF$RR8cB7cVk>_-_$-N1(Fi-1|UG(IA;aRpNWN0 zHOk4u?Xp=&emmkDW6H{`|6HWdJQ9j-tmGwtaS6tH^{!}5!v<+7y~0y`U7+IBLppvn1D?C$ z^`v|`Gzd#{JIF4wRm}*N;)`M-9Ic2!HOd8yG88&2{ytE#odGzwJ|=(Cc!2v-xv>tul4P@c zlu#YKon&V}wszzeUY#fTgLZR?C8-o7vrb>IPd3xlT*lWJQJBNl>&+Y$$;16iN4<8F z91>TNVAKh}RURF8u!cjsmrNIC$x@uQJc|y5!1p;`*kxaEktL680Hl7F$^>FK6GN>(qfxdEG*q zpJl5fhQW=gWe5AzDaFwOU`c+#2x20h>L&zm*7nlGAGgw2hx12bJ{7yMWoFk=-xl}% ztn85}+;(RK5Od{1i~k7aJV$)lY+rV|RKH+cczy8IJk2JW>Z%ev)%ug3&zIPO zhNjKnEES%mfI>2j%bBm#5mv-8Ut0xLJsD?mxRTAvHX#Qg@J5$2nyN64KZWgDvq=4{ zis>JtN)GB&vh&IVp`A6R(3$5? zT}8zN_H48=c`2m@JLKbgYyu%B+&y4=nGVQNpqy|CPe0Uk#cOJF4B7a~>A4@{yq^d= z+dY2?CP`;UOb-L&>4+XGARTOnG%X(RSwb3UP*63L`4hC9QqwkV#-8b@Y~}e z&qo1P^?8O+stRyUdyNS>uWc#J>qJ+6i|k+LLsTL#2rf{l0!wv=@*yr2JR?PX6#X57 z4({S7g8-8rte@--7-!zjgq4!+D9x>%kEkD99fY}R^R(>re>v0IH5h5kLm|1|&t40E zl3vSu5OgPCFp0C&LSOi~l)Eu*$;OV9uV~D z45VY#HHz^(+f+@~#xiz;=WEha%ijl_bJ%ze9M1Xw$_*YAS>n@($`(D8DWhKSh*}en zl;~?5g&%`?7MzSeKIUrtg<%%7if{(my8Qy$cJ{HpxaA63xMbeMVKOMgmQm{b`C9q~ z`mUVWYSq4Hw$+}r&Mmse+Hwu0zZ!hlbAD}e)5r>uoT%uc`uWEkOUFsxNJKu}%vnik z>A}m8mkpui^d8ZBvn@1JhhJF}MqipyUQPp5FUC-AcGi6e76LdKHs_!31;QTqqLc-* zgft8kw=3SSDdAc^nK`&s;;S!c3f&a!xR7TpGgeK9-b=JgWm9m&+6#4TZ75;23y0ea z#pSH8UE8W{g_mk|U^tOk-2dSB`|9q^1pcFqXOvUGQ|gSZxTIRU@_KslJ^;($h`e*! zSNGCa#qGTyqKc~N4sPv+WR8bPja=lwJQq}RAQ03_`1WUM$i>?9`;qOTg-`o_7hh-Y zpUIeaD|d~07Jf;DLy#H?M;d)I3zmA|lA-=QF(5DXLk~4{_Q*tm{4&OxAyS!H-sQ>O z9m^s8Dz2`N!H0exEOsyD$SwnIX#W71S*UtvCz!2NEqm&r+Lv@fwn<29?%vxX>=QpD zm~yt$_>=C-t-Rh`=&ov9@G5-ZYzZlxi~`L#OP!?`ate2*0L-@2gPkkAPP`yR#TP(N zX%xYBcFsduoLnN26IGgCzc1rL+7OFF<@autfSO$}&OAMBZhMvrV#pW+^yMQO32UXU zZdM!mWPM#9cYRc7h+7T_6FmqYhyfJFK`*`DF@ZUaUE%)6-h{w1zeL zhFTD)6c^vN+CDCektklwz6jL?z)xFDdJG=1qr**Q z5S52#^+FwFQR=)TT3Xxnk@v@YCpaz&9B*lyA1&?{#S93o+gQymaE6l5|zPrSQl&53JavQB`mgpdSFvLpPh(C8H;hcy) zaawiUOYrnqKPSh#eku7!`8Z-uwXfADA95%>y^71It1{|Fi8h4Pu+S~)CPgbaoiSo= zzjgR%R(>PggYdRQ9wW{by>KeKE&bs#ynY7ZNN}(gH}p*%Dpl;px_d$g3F#Q?lLIsQ z$emd_6+2c1)d)Z^5I6x$W{pdKUB9TNGT@M_N{R%BSN9vY{dbH!M;)+%wki?^$QmJYD<2%PyOSX@FB6>oGg{S*I)r8F+ zLh67;uTST&c43MgJ_Vuo#@ev2MF!IR7{j$NSWfObSs$V4eI@RYn~|HeDY#`r$zJT9 zV%uUP3ai%`e$J!uHbePkDc??>7OX^%WXOJRQb*nPp+>3D9ko^G@5uD;JY`I@3_@&+ zsu&aRIC~ioKSFasfL*HQ|D<34ab@jO|4;LuHUoDtkbt6I(`^*jMTBOUF^s4h9mbWE zt08p3p=h8N+AM43@zk239P>043x=DXJGe7nwqi}v%jD3i(R6CND_^q60Th-m^SVoU zhiZ|-@}i%+H31$O52aPWMA4(4Ih8^V!VUceo&8XEApWK3i*#q}hc&pAGH3#kE9gy8 zy)MR-1yb8IHA;#3%|q1%+)vV9LI6r2^BkO&yQV;I!i(Vk23?oWED~Xc9H%4>M)_5| zeZd@QrF?X+aOW9t298XyNK@oU5l$vzhb=i8F4V?zbOGJUw@ zij>-S3hL5wp=*6M1F`~t$nrKpo!*R3w zs&7@uXEUAbBuM-vV~vqk@%U3ZTKANQZpdh)8^2J&IWu>h<5?fyKgT8_*UxAqT9(jx zy$A@1{XEsxw1ND}sSe9jBlrS?#22K1?^ztzS&&1#`l|yf@OXbjr$g|?-x#CvfNL5u zkfiIgg>+XkHf@==ehesQPq+UambJCUdY>?rgVv&*6gU)8Z**1h^(e=?^+gl5@eI91 zVtcqq9in_5>70&s_2*m`)-o(CA=|a(kIP(WO>nGCFtQZ0m`K0QJ<9L+$nHF3!JNyZ z@P1Sd0g{z_Al-VilAA7xrNV~in? zEoq`ae<5{pP$qxiIb#F7hkT#%S@oliPvYtE>YA^(fvK+qcS1w=#~?kNMAgoZK@Q*- zHnL#ww}yKCQ$3e(J&e1ma}26>YgUr&;~8Uj#?L!9nc{BNw*=&DLYy5Sb$|ONG2*iQ z!)E%GXjBD66JOPt0ay(ph!vgWj*a1(DLD-|v|yFE9thT%B4|!jG#_P2G7X|t9sTi1 zy~Ue6hR20&B34mG|K&0WK zwrDnPy;xjSd}`lX{B39otgVIM;?(r@V2bK18;rRtRxP$uolul`YE0zLL5QMfx1&lF z(&~>+dTU=PvC<_%CoXuG-UYi%Xe&PewJ#_zZ$k+$;4LdP%`ACgn@YzQMD`i)$|W_r zblS+T*;mI0gNVZ@A`zM-#VIdV*=_hVD(NcwT1r2;;1j8pj#w*2pv(8e0?B^16BWD2 z`*_}JQJXr#&@T)CB$~_LXJ{%e|3q(BmIZlOb+7PqPkt3sFDPve*ayOx<1kj)V5}CM zNW4?oLLgM)%uUo@>(>;Y&&cHl4_|ZPb3(a=(&czXcOTYQM~5D9y@q&>z-XOTW@)gu zMUW|T(gdDg5$$ZflXS2n!W?iaJFOAK)Mq~74+rxD!L%l4o+k7VX@_?3Nr{60P!$mU6b>pJT?m4jYFSyZKF*A8u-SI0 zm+45d^F?;+O8Jp~8teStSAda;z+S3>21`?t!UV5_ZJGAhM?9mbr}~OGOfUFqRB3Sw zh|Bs@jy&M$>f?}9`?1jiGvnk5@*GBYy^J8G>nP4jymvV!^aZUZ^3!?#;-hIAUuCHp zyRpda23?+-orE2YwJ&r{5t=&C%&qsl%uY*C+f$f9ZYIIx$JI7a(Zd`&Rj%Unr&hvZ zTM|Ek&KaBxk>e#UR{o9H_{4GrijLk;Nq39HqTTh`Crh^1Hd;QaO5+f%Rs`fvUjx6Z zC-D6|K2bP;ZZUE$>_1Vl@DA-P{@YK?!fxDNr3>@ z10%_yP9?5pGDd)xsVvm6iUbC#v?#b-QcuQY`#h#-oxt6F)~OPGeU%SE%!lD=uv#V8`fZ+tVN!=`m z=lFjj;QOgIx__85_WpQuWMM9Ny!KZFmD+l3m53LAsJI>7n(3nM4=8N4ZbX`q+RwSnG39?7;02ngv1b~SIvF^;H1ESH)t3F(^9ot z?vaS1#D0puXyl?PhLqnCT<(Hh2$2cJB7jsXySXF<16hFbTW$d9sU=u_6wM@HD;`b$ zxmS16x;0CMGfgDwCF-cZkt_^i27w0mUUT^__V9wX7eA7L)i^_zlfJk*SUJ!+gv*q` zp%0b-=>7HHVLko$vp**!zfAqzpTL8^AWl4as=iK}_05(IUszTMC0AadY|MV(W?V?%%GKlAM0*$m zQMw`m-jb}m70e3StsgzLIEPZ{e#KCX8AXlhVNrTd*yHEqK_I4HGoF5+IaQX?d9EZ! zYJ4TEw~3_T9muckHv*4zx4jJIw;;+Wc&HhGqZtqI(mb4ahb6jex5L`wb``6k-86w--{@CqcNd!L-jGzYnaGLFhKrP=kq#z=b?wOQI?* z}LH#AyQj7EA)su*`Ck`<}_aBoa|##S?yrKPbO{UC0H3U}zp&i(A;lOq$&-smrI(Gvg<7Fh+^FEh5LLd; zH}G_b#i;gAE+2T{I~FJPxDaFVNoGK1eq96NMa<}nxmELYKr{I3Ci(Rg(Y{ZZ-=c)J zYM~2%G)cl67j|EoW^g^A>V6>1cDrn<~yUavb8C)eUd%1_l{hI;nW!`U7(fSpi!$OkVwd-@2D#rq8S8{MlXXc&`i1YB*H}1IykjOl-Cq8 z_TW-RU{$wHce1Ssocgr3uO(&=>5B9l>LxO6cQ)o{N(}2cV%@ASD*)5nrU@y z%Q0MYLZjq+gTo$ol%^Uh24JfL>NMlhHF0|8gCY=E$59MFbgQ{Rq=Wq!${4hFov0el zEMvw1_XpL~EpUB!QVVPlGh-_}1+?+Cy7s^DN{yz}anMvmR;{Xb>m5_hLP_?AkrYQo zYHp=6;lCq!30`#2u~;9GKPsfCu~uEzeuwqplGn#hIsRAzcZsRoia)So4x}VqorWyG zPAoVb(DDEcBzhNRx_T65eM1}Z5@d~IGaX_r8li>&?ScrmUrvfhHCjIM9tu)S0mhO~ z2u8;irNN~v@6x{m#f!{V($wbN0rMAX39|6VvI6Ea1e96Z;Q=M>ulWwy#+vS=`Qz>m zS@Ir}I8Klvy>kwNHAmZSxQuu?aeEMQ^Wh!zxX~*)vmV$G8tivU!J2;C^F!&4g@dtT z^oj{fy2WwQnKDmUe$p{4pUTDy$6Xgzu`7vxUN?1=0beB|x_5W_7Tzy>nJG@7)^An3 zXvU~uCde%7Y-S35dcZ_&ss^Xp$jm%vC~(df{+MmR3CawJ5Dpot4WU#Zo1;37s^l<4M)SyF#TXSd zVd=WDeExxu$w5KO6d!EU*OxF<5fal_gIp5~ya(GmIVe6Mqx{88+Z6eIr;X(Do8Y%C zFtM&lj!F~oS=V)i;X+la4m!6kF%c9AiCJd$iO5py`70vBJJ_pRrvAp~nHS#2h3uig zKnZ~n#CfVMVD4%Y()80H8T~ljci!)9vN#m}2km>`366s&z-KV0T%B{ZDN^C>s+w5o zGx5K3IB74sj^nTqS7x{J*c{T?Y^C(De3;i#)i31@#!W?)21mzKe?f_j?{1l^BS_fsryha%S?+2#b-!(Y=U{R28GW#@*w1%Jq(BX z_9*!ywMP}kTv)cYx#xbrELQ&JQs2Gg8{9K+URl69sA=a1{P0*A2nWG zoOe!-fa3DXLxPN+ zF@a1SjLn!l?Hu2B-2wmt!k&&G6B{#Eps|^SmAxR@Wk(Mg(8^ShOp8;IMbS~*%+gB6 z+u2ObTS?u-+s1^~luTF%Uci&@4ZzOK6$JFOv$c2O^AsfegUk1J{aegT2K=MqY9mOd zt*8PNcW^cXaxif)u`o({TDh~43BdyeoK4O7R3)VThIqRZB(rpNb>w4a_VDmv@?d9j zaJFD(<>lpNW?^GyV`F^NV07`acLjMe+PjedhWHCZ!pz0Q*~-z?%E2D^8xv&g;N~hw zM)o!i{Kx$492FJ+32*Q6Hw$lkFnfX=nOT`wnC1_gJ@O}QEJv~_o zL9*Ze`Ai*5tW5d-T$-4ev+!`SaWV3MczGE)*tyIZjZKWr8Clu6OgK0=xlOpZS^fn| z*51VxWN%{j8|n?5$?6S<)r8v^WX@^M_;zAv=nWY3Ryu#6 zOilQt9GvYyZ|StM16i0cJK9_P8Td^&pQwtgAQ>CeUlac$QLzQNn!g#m^?;SVse^~h z|0t_l*_o-if`0SK%Ej?^uyL@m^02bAas1`#kG-auv&&m8{zheGVPfO?WBxlad~e~r zQ49KAsc!&(0$$mose_Q@3aG=0nX_2vVdDHOvUGsley_%WR zUw3~sfvwe_At3Ni;qrk@{&M01ayK*m3>8k!2EylA@E1xUlxHk zyT4>_i_6TkY&Q~3Y!_&X2(A3eN5|JTWX#P5IU`Y&Do5d;5`@_(!AzjXaa z4E#sR|E;e7XLP~;&+Cqv{o50e$J@({bYmvs+lvsivAnbd03U!2Kr4Wquzi!jIm+m` z000OWzrSFB%xv5@A&jf6q9n`_I2;x!391jbHUI#ABP$`Q?zwic-X~AyM>z8Rj$wjO zV3=h#7)FaKjt?0cYD#!EK!pWn{WC&B&JFf_U&jt9DqqX1SPQh20a0r9dW zs-0A!%q6x!6AEwNy zhr2>q?Y@I?ad81WJv{-vEp`CiYHR>MKmV`*^ws6v<-5xf6eVS49ew?S@86TUx&+A) z2Sythyt{~VkL&MuAyyMe4An#K<`LJnwxD82h34YD_5t%gvW%3QkWm) znEG-iS0cujV@}*bva_?(3(y`vyb?&*b(Fyk|Ki9qcq5SN{5i@gKp?QKuIKdHbG;Kg zAlpob;n3L^9z1i3Dla&&L?3yg;r&alT5a&Kc%2==ddq9Y9)zzD@9xAZ9v~|#3*gJk zzkf3}b`Ak3TRt1+SU=M6_sV#_W&=!_->kN9e@3lbK9izKVP(sR{mzX=va^1{_~7er z41I9p)xEiOYOV2)wET6>l|4^5U9@&{O{uzkvbD2w^7pr=nd7GO@7X31tXQ;mb#ueI zeR>((EP3%K2LJ9y5?EAJH0bx!L-yQ%o`Y9ND0ju*!y|3 zH{1gEd5VsmU}aO&#Z^k@3)p`;NRBw6Z@)xkfR(6@;l6&8{wvgjMSpOOb%w=XcL`N* P9RZM)RFbF>GYbAci2hdI literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/patholodrobe.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..a249c5ea3294a0f16159913ddea388d78b1eb89e GIT binary patch literal 557 zcmV+|0@D47P)Nkl=F2N1(=Hvmq9|7K?^^^a5Q4A zii8|B{c7dKiUmVM#)5qTY-xBq)=FwSR06fq72qx?sHf2M_FFl)3kvGJ)hAA=_~~Iw z!(%P1Ni!+|0&M7603D!40!G`g`BayNHwdtdNr3Fzjr2MwiUK~Lk5$8pw^}VwRTWaH z6zB&EZ0}ZJ=QzMT12Bg5P|cHJmB*k v#w9Q~w$zn5-TD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001 From 99b04e517c296af964702a6a36deb35d718fdf4e Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:23:21 +0000 Subject: [PATCH 39/75] =?UTF-8?q?=D0=BF=D1=8B=D1=82=D0=B0=D0=B5=D0=BC?= =?UTF-8?q?=D1=81=20=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D1=82=D1=8C=20=D1=8F?= =?UTF-8?q?=D0=BC=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Clothing/OuterClothing/coats.yml | 2 +- .../Coats/labcoat_pathologist.rsi/icon-open.png | Bin 0 -> 492 bytes .../Coats/labcoat_pathologist.rsi/meta.json | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon-open.png diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 6d2ba1fb9dd..6ed90626a0f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -6,7 +6,7 @@ components: - type: Sprite sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi - state: icon + state: icon-open - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi state: equipped-OUTERCLOTHING diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon-open.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..4800a822f285dede784b76a36c05f20043c76635 GIT binary patch literal 492 zcmV1vSTNO%aTuO)9+D; Date: Mon, 22 Jul 2024 20:35:48 +0000 Subject: [PATCH 40/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD=D0=B2=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=8F=20=D0=B2=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VendingMachines/Inventories/patholodrobe.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml new file mode 100644 index 00000000000..d702327837f --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/patholodrobe.yml @@ -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 \ No newline at end of file From de0a19b0754b12e36655e0f03b9e242c2a53a475 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:39:04 +0000 Subject: [PATCH 41/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D1=87=D0=B8=20=D0=B2?= =?UTF-8?q?=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl | 2 ++ Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl | 4 ++++ .../Catalog/VendingMachines/Advertisements/patholodrobe.yml | 5 +++++ 3 files changed, 11 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl new file mode 100644 index 00000000000..575fc0a5cc1 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl @@ -0,0 +1,2 @@ +advertisement-patholog-1 = Только не запачкайтесь. +advertisement-patholog-2 = Самая красивая одежда среди обитателей морга! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl new file mode 100644 index 00000000000..ad9b3127bbe --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl @@ -0,0 +1,4 @@ +advertisement-pill-1 = Утопите боль в таблетках! +advertisement-pill-2 = Хочешь витаминку? +advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! +advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml new file mode 100644 index 00000000000..8bc74a39f83 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml @@ -0,0 +1,5 @@ +- type: advertisementsPack + id: PatholodrobeAds + advertisements: + - advertisement-patholog-1 + - advertisement-patholog-2 \ No newline at end of file From b373d627bceb23e80094972baeb886e925fbded9 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:46:59 +0000 Subject: [PATCH 42/75] =?UTF-8?q?=D0=BC=D0=B5=D1=88=D0=BE=D0=BA=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=82=D0=B5=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specific/Medical/randompill.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 33e21e7972e..d50503ec299 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -88,3 +88,20 @@ pill18: "" pill19: "" pill20: "" + +- type: entity + id: BodyBag_Folded + name: body bag + description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. + parent: BodyBag_Container + suffix: folded + components: + - type: Foldable + folded: true +# - type: BodyBagItem #TODO: we need some kind of generic placable, like thus: +# - type: Placeable +# prototype: someId +# snap: Center + - type: GuideHelp + guides: + - ADTPathologist \ No newline at end of file From eb0ed2559de105a927e967d5ba9cc86fa4840d71 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:58:05 +0000 Subject: [PATCH 43/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B8=D0=B7=D0=BE=D1=80=D0=B0=20?= =?UTF-8?q?=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4=D1=8B=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=83=D1=8E=20=D0=BD=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Roles/Jobs/Medical/pathologist.yml | 8 ++++---- .../Misc/job_icons.rsi/ADTPathologist.png | Bin 0 -> 160 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/ADTPathologist.png diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml index e85d069620a..8e670836fda 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml @@ -24,10 +24,10 @@ id: ADTPathologistPDA ears: ClothingHeadsetMedical belt: BoxFolderClipboard - underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear - socks: ClothingUnderwearSocksNormal - underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear + # До добавления трусов underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear + # До добавления носков socks: ClothingUnderwearSocksNormal + # До добавления лифчика underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear + # До добавления трусов ж underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear innerClothingSkirt: ADTClothingUniformPathologistSkirt satchel: ADTClothingBackpackSatchelPathologistFilled duffelbag: ADTClothingBackpackDuffelPathologistFilled diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ADTPathologist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ADTPathologist.png new file mode 100644 index 0000000000000000000000000000000000000000..3e4b6a7d63774dff333297e9aa8e89f8a8c31d3b GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFq>7Fi*Are!QQxXyq1U~lvJKw;% z=jM(n6J3wk|JuK%*_0Uw4)1KzU;}~0oTn4A{uv*P&|m&G@xZY(kcR*N|Ff@&IASlA z$fS3GWpi+pE~lQx+G#B1>~~l`>WH)DYTPIv_2vQ4N(N6?KbLh*2~7a? CmN&`( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index b0f8a432f8e..f34f51e1870 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -192,6 +192,9 @@ { "name": "InitialInfected" }, + { + "name": "ADTPathologist" + }, { "name": "Admin" } From 5c4f18d97f36739ad2cb3228b2bd64e346da3d19 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:00:47 +0000 Subject: [PATCH 44/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=B0=D0=B9=D0=B4=D0=B1=D1=83?= =?UTF-8?q?=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/ServerInfo/ADT/Pathologist.xml | 78 ++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 Resources/ServerInfo/ADT/Pathologist.xml diff --git a/Resources/ServerInfo/ADT/Pathologist.xml b/Resources/ServerInfo/ADT/Pathologist.xml new file mode 100644 index 00000000000..bbd6e58d337 --- /dev/null +++ b/Resources/ServerInfo/ADT/Pathologist.xml @@ -0,0 +1,78 @@ + +# Морг и патологоанатом +Последнее место, в котором хотел бы оказаться пациент - морг. + +Разберёмся в основах обслуживания трупов. + +## Морг + +[head=3]Ячейки морга[/head] + + + +В местных дормах трупы (в основном) лежат в специальных ячейках морга. Не пренебригайте ими, оставляя на полу умерших, поскольку морг не позволяет телам гнить. + +На нижней части ячейки находится сенсор, отображающий состояние души и, соответственно, возможность воскресить мертвеца. + +- [color=green]Зелёный[/color] цвет обозначает, что душа находится в теле и готова к клонированию или ударам дефибриллятора. Дабы привлечь к себе внимание и помочь поскорее возрадить пациента, морг начинает пищать как утренний будильник. +- [color=red]Красный[/color] цвет означает, что в ячейке находится труп без души. +- [color=yellow]Жёлтый[/color] цвет значит, что в морге находится посторонний предмет. Не советуется оставлять это без внимания. Зачем использовать морг как шкафчик? + +[head=3]Переработка[/head] + + + + + +Крайне не советуется перерабатывать тела умерших членов экипажа (если их не клонировали), однако, если оно пролежало в морге без души уже достаточно долго, или в случае недостатка биомассы в критической ситуации стоит прибегнуть к переработчику биомассы. + +Перенеся тело [color=red]без души[/color] (важная деталь, поскольку трупы с душой не даются переработке.) в переработчик биомассы (вашим курсором) оно будет раздроблено для повторного использования. Если это член экипажа, лучше всего раздеть тело и вернуть его вещи перед переработкой. +- Держите в голове, что чем больше тело - тем дольше длится переработка, но и количество биомассы увеличится. +- В среднем с одного человека получается 28 единиц биомассы. + +[head=3]Гниение[/head] + +Разложение - естественный процесс для всего живого. Или, в нашем случае, не совсем живого. + +Перед тем, как начать разлагаться, свежий труп пролежит 10 минут. Понять сколько времени осталось до этого можно осмотрев тело. +- [color=green]Тело всё ещё выглядит свежим.[/color] +- [color=orangered]Тело выглядит отчасти свежим.[/color] +- [color=red]Похоже, тело не свежее.[/color] + +В самом гниении так же есть несколько стадий. +- [color=orange]Тело гниёт![/color] +- [color=orangered]Тело вздулось![/color] +- [color=red]Тело сильно вздулось![/color] + +Учитывайте, что гниющие тела выделяют [color=purple]миазмы[/color]. Если оставить гнилое тело в морге слишком надолго, то, открыв ячейку, ваш ждёт вонючий сюрпиз. +- Помимо этого, сильно вздувшиеся тела могут разорваться, выпустив ещё больше миазм! + +Если осмотрев тело вы понимаете, что оно [color=#edad45]забальзамировано[/color], то это значит, что дальнейшие степени гниения не произойдут. + +## Патологоанатом +Поздравляю, отныне вы работаете в самом тихом участке медицинского отдела. + +Патологоанатом выявляет причины смерти, следит за сохранностью трупов и их предметов, ведёт документацию свидетельств о смерти, а так же клонирует тела. [italic](Смотрите пункт "Клонирование" в руководстве.)[/italic] + +[head=3]Экипировка[/head] + + + + + + + + + + + + + +- В ваш КПК встроен анализатор здоровья, так что вам не придётся бегать по зарядникам. +- Мешок для трупов не даёт телам разлагаться, а так же ускоряет их перемещение, так что этот предмет незаменим в работе патологоанатома. Мало того, в случае, когда все ячейки морга забиты, вместо них можно использовать мешки. +- Бирка для ног говорит сама за себя. Удобна для тех случаев, когда поток трупов большой, и их сортировка становится затруднительной. +- Бумага - ваша кладесь информации и основа работы. В ней вы храните всё, что касается определённого мертвеца. Так же важно подметить, что вы можете прикрепить листок к ячейке морга или мешку. +- Формалин - препарат, свёртывающий белки и предотвращающий их разложение. Используется для [color=#edad45]бальзамирования[/color] трупов. [color=#edad45]Бальзамирование[/color], как и было сказано выше, предотвращает гниение трупов. Достаточно всего 5 единиц, однако учитывайте, что вы не можете воскресить забальзамированный труп дефибриллятором, так что советуется применять формалин в случаях, когда тело вот-вот или уже начало разложение. +- Небольшой шприц удобен своими размерами, а так же возможностью вставить его в раздатчики или анализатор вещества. Если вам привезли свежий труп, то советуется взять образец его крови. Не переваренные вещества в ней могут помочь расследовать смерть пациента. А так же вместимости шприца достаточно, чтобы бальзамировать тела. +- Для случаев экстренной медицинской помощи или же для приведения внешнего вида мертвеца в какой-никакой порядок желательно носить с собой медикаменты. Так же стоит отметить, что трупы можно исцелять при помощи криогенных препаратов. [italic](Смотрите пункт "Криогеника" в руководстве.)[/italic] + \ No newline at end of file From 34fc7a0d1876798834df1e3a5b2da59d51a2c877 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:05:17 +0000 Subject: [PATCH 45/75] =?UTF-8?q?=D1=85=D0=B7,=20=D0=BC=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BF=D0=BE=D0=BC=D0=BE=D0=B6=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl | 6 +++++- Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl | 4 ---- .../Catalog/VendingMachines/Advertisements/patholodrobe.yml | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl index 575fc0a5cc1..30054193480 100644 --- a/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl +++ b/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl @@ -1,2 +1,6 @@ advertisement-patholog-1 = Только не запачкайтесь. -advertisement-patholog-2 = Самая красивая одежда среди обитателей морга! \ No newline at end of file +advertisement-patholog-2 = Самая красивая одежда среди обитателей морга! +advertisement-pill-1 = Утопите боль в таблетках! +advertisement-pill-2 = Хочешь витаминку? +advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! +advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl deleted file mode 100644 index ad9b3127bbe..00000000000 --- a/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl +++ /dev/null @@ -1,4 +0,0 @@ -advertisement-pill-1 = Утопите боль в таблетках! -advertisement-pill-2 = Хочешь витаминку? -advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! -advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml index 8bc74a39f83..6e51e573146 100644 --- a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml @@ -2,4 +2,8 @@ id: PatholodrobeAds advertisements: - advertisement-patholog-1 - - advertisement-patholog-2 \ No newline at end of file + - advertisement-patholog-2 + - advertisement-pill-1 = Утопите боль в таблетках! + - advertisement-pill-2 = Хочешь витаминку? + - advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! + - advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file From adec1a9ed01dad3d2d1df146cd5f3b6318a3a8b3 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:12:16 +0000 Subject: [PATCH 46/75] =?UTF-8?q?Revert=20"=D1=85=D0=B7,=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D1=82=20=D0=BF=D0=BE=D0=BC=D0=BE=D0=B6=D0=B5=D1=82?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 34fc7a0d1876798834df1e3a5b2da59d51a2c877. --- Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl | 6 +----- Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl | 4 ++++ .../Catalog/VendingMachines/Advertisements/patholodrobe.yml | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl index 30054193480..575fc0a5cc1 100644 --- a/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl +++ b/Resources/Locale/ru-RU/ADT/Advertisments/patholog.ftl @@ -1,6 +1,2 @@ advertisement-patholog-1 = Только не запачкайтесь. -advertisement-patholog-2 = Самая красивая одежда среди обитателей морга! -advertisement-pill-1 = Утопите боль в таблетках! -advertisement-pill-2 = Хочешь витаминку? -advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! -advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file +advertisement-patholog-2 = Самая красивая одежда среди обитателей морга! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl new file mode 100644 index 00000000000..ad9b3127bbe --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl @@ -0,0 +1,4 @@ +advertisement-pill-1 = Утопите боль в таблетках! +advertisement-pill-2 = Хочешь витаминку? +advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! +advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml index 6e51e573146..8bc74a39f83 100644 --- a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml @@ -2,8 +2,4 @@ id: PatholodrobeAds advertisements: - advertisement-patholog-1 - - advertisement-patholog-2 - - advertisement-pill-1 = Утопите боль в таблетках! - - advertisement-pill-2 = Хочешь витаминку? - - advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! - - advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file + - advertisement-patholog-2 \ No newline at end of file From ba295863e11c1d7a21ea9ca75b4806b022091609 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:15:25 +0000 Subject: [PATCH 47/75] =?UTF-8?q?[TODO]=20=D0=A0=D0=90=D0=97=D0=9A=D0=9E?= =?UTF-8?q?=D0=9C=D0=95=D0=9D=D0=A2=D0=98=D0=A2=D0=AC=20=D0=BF=D0=BE=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=D0=B3=D0=BE=20=D1=8F=D0=BC=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VendingMachines/Advertisements/patholodrobe.yml | 10 +++++----- .../Entities/Structures/Machines/vending_machines.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml index 8bc74a39f83..847ae5c7be9 100644 --- a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml @@ -1,5 +1,5 @@ -- type: advertisementsPack - id: PatholodrobeAds - advertisements: - - advertisement-patholog-1 - - advertisement-patholog-2 \ No newline at end of file +#- type: advertisementsPack +# id: PatholodrobeAds +# advertisements: +# - advertisement-patholog-1 +# - advertisement-patholog-2 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml index b3e80f7fa17..0f0a87443c3 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml @@ -9,8 +9,8 @@ offState: off brokenState: broken normalState: normal-unshaded - - type: Advertise - pack: PatholodrobeAds + #- type: Advertise + # pack: PatholodrobeAds - type: Sprite sprite: ADT/Structures/Machines/VendingMachines/patholodrobe.rsi layers: From 5713c71f01d3a2867cb9e1374576cb0443bbf248 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:35:29 +0000 Subject: [PATCH 48/75] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=80=D1=84=D0=BE=D0=B3=D1=80=D0=B0=D1=84?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D1=83=D1=8E=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl index ad9b3127bbe..67009bb3bf0 100644 --- a/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl +++ b/Resources/Locale/ru-RU/ADT/Advertisments/pill.ftl @@ -1,4 +1,4 @@ advertisement-pill-1 = Утопите боль в таблетках! advertisement-pill-2 = Хочешь витаминку? -advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примите таблетку галоперидола! +advertisement-pill-3 = Голоса становятся всё громче... Пока вы не примете таблетку галоперидола! advertisement-pill-4 = Все престарелые пьют таблетки из этого автомата! \ No newline at end of file From 392b7780954d069ddaee237dfc91fa6992e708e0 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:43:42 +0000 Subject: [PATCH 49/75] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specific/Medical/morgue.yml | 20 ++++++------------ .../Morgue/bodybags.rsi/label_overlay.png | Bin 0 -> 167 bytes 2 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 00c043aa628..f6fd2cc7e06 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -1,5 +1,5 @@ - type: entity - id: BodyBag + id: BodyBag_Container parent: BaseFoldable name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. @@ -17,8 +17,8 @@ visible: false - state: open_overlay map: ["enum.StorageVisualLayers.Door"] - - state: paper - map: ["enum.PaperLabelVisuals.Layer"] + - state: label_overlay + map: ["enum.BodyBagVisualLayers.Label"] - type: Icon sprite: Objects/Specific/Medical/Morgue/bodybags.rsi state: bag @@ -62,15 +62,9 @@ - type: GenericVisualizer visuals: enum.PaperLabelVisuals.HasLabel: - enum.PaperLabelVisuals.Layer: + enum.BodyBagVisualLayers.Label: True: {visible: true} False: {visible: false} - enum.PaperLabelVisuals.LabelType: - enum.PaperLabelVisuals.Layer: - Paper: { state: paper } - Bounty: { state: bounty } - CaptainsPaper: { state: captains_paper } - Invoice: { state: invoice } enum.FoldedVisuals.State: foldedLayer: True: {visible: true} @@ -92,10 +86,10 @@ - ADTPathologist - type: entity - id: BodyBagFolded + id: BodyBag_Folded name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. - parent: BodyBag + parent: BodyBag_Container suffix: folded components: - type: Foldable @@ -132,8 +126,6 @@ - type: SolutionSpiker sourceSolution: food ignoreEmpty: true - - type: ScoopableSolution - solution: food - type: Extractable grindableSolutionName: food diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c5a78d2351ba6caa3c929ebaf6417b1f2387c6 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJWm(Lkcv5PFYM+$puoctV0`AJ z(C;0IdT9$5ez2K$Y^9K@lIqH$^_xEUyR~$Hz`u2K8h59!4Gr1q;&QJ$Wb2x>(mQ`| zHBb_A_;yd&f$2nb-S($O#;32{dYs#%SbWaE?qTVQnYMcWvMeWdoM61)r@Y$X=T04< O%?zHdelF{r5}E+I?nFrd literal 0 HcmV?d00001 From 077fc445e6705f30dc1d7c2361f5a42b748af052 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:50:38 +0000 Subject: [PATCH 50/75] =?UTF-8?q?Revert=20"=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D0=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 392b7780954d069ddaee237dfc91fa6992e708e0. --- .../Objects/Specific/Medical/morgue.yml | 20 ++++++++++++------ .../Morgue/bodybags.rsi/label_overlay.png | Bin 167 -> 0 bytes 2 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index f6fd2cc7e06..00c043aa628 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -1,5 +1,5 @@ - type: entity - id: BodyBag_Container + id: BodyBag parent: BaseFoldable name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. @@ -17,8 +17,8 @@ visible: false - state: open_overlay map: ["enum.StorageVisualLayers.Door"] - - state: label_overlay - map: ["enum.BodyBagVisualLayers.Label"] + - state: paper + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Objects/Specific/Medical/Morgue/bodybags.rsi state: bag @@ -62,9 +62,15 @@ - type: GenericVisualizer visuals: enum.PaperLabelVisuals.HasLabel: - enum.BodyBagVisualLayers.Label: + enum.PaperLabelVisuals.Layer: True: {visible: true} False: {visible: false} + enum.PaperLabelVisuals.LabelType: + enum.PaperLabelVisuals.Layer: + Paper: { state: paper } + Bounty: { state: bounty } + CaptainsPaper: { state: captains_paper } + Invoice: { state: invoice } enum.FoldedVisuals.State: foldedLayer: True: {visible: true} @@ -86,10 +92,10 @@ - ADTPathologist - type: entity - id: BodyBag_Folded + id: BodyBagFolded name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. - parent: BodyBag_Container + parent: BodyBag suffix: folded components: - type: Foldable @@ -126,6 +132,8 @@ - type: SolutionSpiker sourceSolution: food ignoreEmpty: true + - type: ScoopableSolution + solution: food - type: Extractable grindableSolutionName: food diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png deleted file mode 100644 index b0c5a78d2351ba6caa3c929ebaf6417b1f2387c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJWm(Lkcv5PFYM+$puoctV0`AJ z(C;0IdT9$5ez2K$Y^9K@lIqH$^_xEUyR~$Hz`u2K8h59!4Gr1q;&QJ$Wb2x>(mQ`| zHBb_A_;yd&f$2nb-S($O#;32{dYs#%SbWaE?qTVQnYMcWvMeWdoM61)r@Y$X=T04< O%?zHdelF{r5}E+I?nFrd From 9f457b9cf23ccdf54ce660a01684f20159f4a17f Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:51:45 +0000 Subject: [PATCH 51/75] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B0=D0=B9=D0=B4=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Entities/Objects/Specific/Medical/morgue.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 00c043aa628..9be93f38757 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -1,5 +1,5 @@ - type: entity - id: BodyBag + id: BodyBag_Container parent: BaseFoldable name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. @@ -92,7 +92,7 @@ - ADTPathologist - type: entity - id: BodyBagFolded + id: BodyBag_Folded name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. parent: BodyBag From 8c7338bcde27ded0f24e80b68218cc7c6f0d7a8e Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:57:51 +0000 Subject: [PATCH 52/75] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specific/Medical/randompill.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index d50503ec299..441cf71b6d4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -89,19 +89,19 @@ pill19: "" pill20: "" -- type: entity - id: BodyBag_Folded - name: body bag - description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. - parent: BodyBag_Container - suffix: folded - components: - - type: Foldable - folded: true +#- type: entity +# id: BodyBag_Folded +# name: body bag +# description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. +# parent: BodyBag_Container +# suffix: folded +# components: +# - type: Foldable +# folded: true # - type: BodyBagItem #TODO: we need some kind of generic placable, like thus: # - type: Placeable # prototype: someId # snap: Center - - type: GuideHelp - guides: - - ADTPathologist \ No newline at end of file +# - type: GuideHelp +# guides: +# - ADTPathologist \ No newline at end of file From 8a43443d313726abe517490aa3e01fb7083dd7a7 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:05:26 +0000 Subject: [PATCH 53/75] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Entities/Objects/Specific/Medical/morgue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 9be93f38757..e3f72489703 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -95,7 +95,7 @@ id: BodyBag_Folded name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. - parent: BodyBag + parent: BodyBag_Container suffix: folded components: - type: Foldable From 96cc69938a91ee8308b9693c8db3c179985cb63e Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:53:49 +0000 Subject: [PATCH 54/75] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=8F=D0=BC?= =?UTF-8?q?=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 2 +- .../ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml | 2 +- .../Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml | 1 - Resources/Prototypes/Catalog/Fills/Boxes/medical.yml | 2 +- Resources/Prototypes/Recipes/Lathes/medical.yml | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index db6d2cc3c6b..ce529a84c5c 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -7,5 +7,5 @@ contents: - id: BoxSurvivalMedical - id: BodyBag_Folded - - id: ADTFootTag + # - id: ADTFootTag Разкоментить после добавления слота для носков - id: SpaceCash500 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 45168480281..3510bc61713 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -7,5 +7,5 @@ contents: - id: BoxSurvivalMedical - id: BodyBag_Folded - - id: ADTFootTag + #- id: ADTFootTag Разкоментить после добавления слота для носков - id: SpaceCash500 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index b2c02ddcd50..e299836a40d 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -7,5 +7,5 @@ contents: - id: BoxSurvivalMedical - id: BodyBag_Folded - - id: ADTFootTag + # - id: ADTFootTag Разкоментить после добавления слота для носков - id: SpaceCash500 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 6ed90626a0f..c37724ce201 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -9,4 +9,3 @@ state: icon-open - type: Clothing sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi - state: equipped-OUTERCLOTHING diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index d7dd6c5a61a..d0b5f75b5d8 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -96,7 +96,7 @@ components: - type: StorageFill contents: - - id: BodyBagFolded + - id: BodyBag_Folded amount: 4 - type: Sprite layers: diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 6460c745fa3..2608df3aa10 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -49,7 +49,7 @@ - type: latheRecipe id: BodyBag - result: BodyBagFolded + result: BodyBag_Folded completetime: 2 materials: Plastic: 300 From 69aaea8c9c0bdd08f9651430de5baa6e41361db5 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:58:03 +0000 Subject: [PATCH 55/75] =?UTF-8?q?=D0=A3=D0=91=D0=A0=D0=90=D0=A2=D0=AC=20?= =?UTF-8?q?=D0=9A=D0=9E=D0=9C=D0=9C=D0=95=D0=9D=D0=A2=D0=AB=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=81=D0=BB=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B?= =?UTF-8?q?=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D1=80=D1=8E=D0=BA?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml index 8e670836fda..6419075d19b 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/pathologist.yml @@ -28,6 +28,6 @@ # До добавления носков socks: ClothingUnderwearSocksNormal # До добавления лифчика underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear # До добавления трусов ж underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerClothingSkirt: ADTClothingUniformPathologistSkirt - satchel: ADTClothingBackpackSatchelPathologistFilled - duffelbag: ADTClothingBackpackDuffelPathologistFilled + # Разкоментить после добавления системы рюкзаков при старте innerClothingSkirt: ADTClothingUniformPathologistSkirt + # Разкоментить после добавления системы рюкзаков при старте satchel: ADTClothingBackpackSatchelPathologistFilled + # Разкоментить после добавления системы рюкзаков при старте duffelbag: ADTClothingBackpackDuffelPathologistFilled From 4726ccb616ac7b48395a05ec059a39fb034e5eb7 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 21:03:08 +0000 Subject: [PATCH 56/75] =?UTF-8?q?=D0=BD=D1=83=20=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D1=82=20=D0=BA=D0=B0=D0=BA-=D0=BD=D0=B8=D0=B1=D1=83=D0=B4?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=BC=D0=BE=D0=B6=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 +- Resources/Prototypes/Recipes/Lathes/medical.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 28f5796c710..8847a3c382c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -933,7 +933,7 @@ - Syringe - Implanter - PillCanister - - BodyBag + - BodyBags - ChemistryEmptyBottle01 - RollerBedSpawnFolded - CheapRollerBedSpawnFolded diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 2608df3aa10..7d95c900e78 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -48,7 +48,7 @@ Steel: 200 - type: latheRecipe - id: BodyBag + id: BodyBags result: BodyBag_Folded completetime: 2 materials: From 5089f64a1cca476a75fe4de9e0023cbd5b80413d Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 21:17:42 +0000 Subject: [PATCH 57/75] =?UTF-8?q?Revert=20"=D0=BD=D1=83=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=BD=D1=82=20=D0=BA=D0=B0=D0=BA-=D0=BD=D0=B8=D0=B1?= =?UTF-8?q?=D1=83=D0=B4=D1=8C=20=D0=BF=D0=BE=D0=BC=D0=BE=D0=B6=D0=B5=D1=82?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4726ccb616ac7b48395a05ec059a39fb034e5eb7. --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 +- Resources/Prototypes/Recipes/Lathes/medical.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8847a3c382c..28f5796c710 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -933,7 +933,7 @@ - Syringe - Implanter - PillCanister - - BodyBags + - BodyBag - ChemistryEmptyBottle01 - RollerBedSpawnFolded - CheapRollerBedSpawnFolded diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 7d95c900e78..2608df3aa10 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -48,7 +48,7 @@ Steel: 200 - type: latheRecipe - id: BodyBags + id: BodyBag result: BodyBag_Folded completetime: 2 materials: From f37271ac1cc397992abafe35d12b4103fd8ca239 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 22:00:17 +0000 Subject: [PATCH 58/75] =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=B5=D0=BC=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D1=83=20=D0=B4=D1=80=D1=83=D0=B3=D0=B8?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Recipes/Lathes/medical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 2608df3aa10..d62daec8132 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -48,7 +48,7 @@ Steel: 200 - type: latheRecipe - id: BodyBag + id: BodyBag_Folded result: BodyBag_Folded completetime: 2 materials: From 2fdf05486500a53efbcb8e80cb858a22b4572de2 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 22:12:46 +0000 Subject: [PATCH 59/75] =?UTF-8?q?=D0=B2=D1=8B=D1=80=D0=B5=D0=B7=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=8F=D1=89=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Fills/Lockers/biohazard.yml | 18 +++++++++--------- .../Storage/Closets/Lockers /lockers.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index 4b36638b4b6..9d2acca0038 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,10 +1,10 @@ - - type: entity - parent: ADTClosetLPathologist - id: ADTClosetLPathologistFilled - suffix: Filled, Pathologist - components: - - type: StorageFill - contents: - - id: ADTClothingOuterBioPathologist - - id: ADTClothingHeadHatHoodBioPathologist + #- type: entity + # parent: ADTClosetLPathologist + # id: ADTClosetLPathologistFilled + # suffix: Filled, Pathologist + # components: + # - type: StorageFill + # contents: + # - id: ADTClothingOuterBioPathologist + # - id: ADTClothingHeadHatHoodBioPathologist diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml index 9bfb87bb294..9f200c6001e 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml @@ -45,12 +45,12 @@ - type: Appearance # Патолог. -- type: entity - parent: ADTClosetL3 - id: ADTClosetLPathologist - components: - - type: Appearance - - type: EntityStorageVisuals - stateBaseClosed: bio_pathologist - stateDoorOpen: bio_pathologist_open - stateDoorClosed: bio_pathologist_door +#- type: entity +# parent: ADTClosetL3 +# id: ADTClosetLPathologist +# components: +# - type: Appearance +# - type: EntityStorageVisuals +# stateBaseClosed: bio_pathologist +# stateDoorOpen: bio_pathologist_open +# stateDoorClosed: bio_pathologist_door From 54547ff94275b58bb8eb1c4c827291d1b6a86ebe Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sat, 27 Jul 2024 22:33:47 +0000 Subject: [PATCH 60/75] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D0=BC=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=BB=D0=BE=D0=B4=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 28f5796c710..7bf32d100a9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -933,7 +933,7 @@ - Syringe - Implanter - PillCanister - - BodyBag + - BodyBag_Folded - ChemistryEmptyBottle01 - RollerBedSpawnFolded - CheapRollerBedSpawnFolded From 72e02e1641f2fafc01478583f11907f82779c8c3 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:00:35 +0000 Subject: [PATCH 61/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=82=D0=BE=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=D0=B0=20=D0=B8=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B0=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Maps/ADTMaps/atlas.yml | 78 +++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/avrite.yml | 73 ++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/bagel.yml | 82 ++++++++++++++++++ Resources/Prototypes/ADT/Maps/ADTMaps/box.yml | 81 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/cluster.yml | 80 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/core.yml | 84 +++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/delta.yml | 71 ++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/europa.yml | 81 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/fill.txt | 1 - .../Prototypes/ADT/Maps/ADTMaps/fland.yml | 82 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/marathon.yml | 82 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/meta.yml | 80 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/omega.yml | 80 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/origin.yml | 83 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/packed.yml | 79 +++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/saltern.yml | 80 ++++++++++++++++++ .../Prototypes/ADT/Maps/ADTMaps/train.yml | 82 ++++++++++++++++++ 17 files changed, 1278 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/box.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/core.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/train.yml diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml new file mode 100644 index 00000000000..9e285afce4e --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml @@ -0,0 +1,78 @@ +- type: gameMap + id: ADTAtlas + mapName: Atlas + mapPath: /Maps/ADTMaps/adt_atlas.yml + minPlayers: 0 + maxPlayers: 20 + stations: + ADTAtlas: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Atlas {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'R4' # R4407/Goon. GS isn't as cool sounding. + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 2, 2 ] + TechnicalAssistant: [ 1, 3 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 1, 1 ] + MedicalDoctor: [ 2, 2 ] + MedicalIntern: [ 1, 3 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 2, 2 ] + ResearchAssistant: [ 1, 3 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SecurityOfficer: [ 3, 3 ] + SecurityCadet: [ 1, 3 ] + Detective: [ 1, 1 ] + Lawyer: [1, 1] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + ADTRoboticist: [ 1, 1 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml new file mode 100644 index 00000000000..e9f29672dc0 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml @@ -0,0 +1,73 @@ +- type: gameMap + id: ADTAvrite + mapName: 'Avrite Station' + mapPath: /Maps/ADTMaps/adt_avrite.yml + minPlayers: 40 + stations: + ADTAvrite: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Avrite {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'TG' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxavrit.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + CargoTechnician: [ 4, 4 ] + Passenger: [ -1, -1 ] + Bartender: [ 2, 2 ] + Botanist: [ 3, 3 ] + Chef: [ 2, 2 ] + Clown: [ 1, 1 ] + Janitor: [ 3, 3 ] + Mime: [ 1, 1 ] + Captain: [ 1, 1 ] + IAA: [ 1, 1 ] + Reporter: [ 2, 2 ] + HeadOfPersonnel: [ 1, 1 ] + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 4 ] + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 4, 4 ] + Chemist: [ 3, 3 ] + Zookeeper: [ 1, 1 ] + ResearchDirector: [ 1, 1 ] + Scientist: [ 6, 6 ] + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 6, 6 ] + Chaplain: [ 1, 1 ] + Warden: [ 1, 1 ] + Librarian: [ 1, 1 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 4, 4 ] + Musician: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + TechnicalAssistant: [ 4, 4 ] + ResearchAssistant: [ 5, 5 ] + MedicalIntern: [ 4, 4 ] + ServiceWorker: [ 4, 4 ] + SecurityCadet: [ 4, 4 ] + Psychologist: [ 1, 1 ] + Detective: [ 1, 1 ] + Boxer: [ 2, 2] + Paramedic: [ 1, 1 ] + Borg: [ 2, 2 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + Lawyer: [1, 1] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTRoboticist: [ 1, 1 ] #ADT + #Senitors + SeniorOfficer: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml new file mode 100644 index 00000000000..da761788996 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml @@ -0,0 +1,82 @@ +- type: gameMap + id: ADTBagel + mapName: 'Bagel Station' + mapPath: /Maps/ADTMaps/adt_bagel.yml + minPlayers: 20 + maxPlayers: 150 + stations: + ADTBagel: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Bagel Station {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 3, 3 ] + Chef: [ 2, 2 ] + Janitor: [ 3, 3 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 4, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] + Paramedic: [ 1, 1 ] + MedicalIntern: [ 4, 4 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 5, 5 ] + ResearchAssistant: [ 4, 4 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 4, 4 ] + Lawyer: [ 2, 2 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Reporter: [ 2, 2 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + ADTRoboticist: [ 2, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml new file mode 100644 index 00000000000..7e64717d29e --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml @@ -0,0 +1,81 @@ +- type: gameMap + id: ADTBox + mapName: 'Box Station' + mapPath: /Maps/ADTMaps/adt_box.yml + minPlayers: 20 + stations: + ADTBox: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Box Station {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'TG' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 3, 3 ] + Chef: [ 2, 2 ] + Janitor: [ 2, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 4, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 2, 3 ] + MedicalDoctor: [ 3, 3 ] + Paramedic: [ 1, 1 ] + MedicalIntern: [ 4, 4 ] + Psychologist: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + Scientist: [ 4, 4 ] + ResearchAssistant: [ 4, 4 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 4, 4 ] + Lawyer: [ 2, 2 ] # Corvax-IAA + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 2, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml new file mode 100644 index 00000000000..abded692c9e --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml @@ -0,0 +1,80 @@ +- type: gameMap + id: ADTCluster + mapName: 'Cluster' + mapPath: /Maps/ADTMaps/adt_cluster.yml + minPlayers: 0 + maxPlayers: 45 + stations: + ADTCluster: + stationProto: StandardNanotrasenStation + components: + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_transit.yml + - type: StationNameSetup + mapNameTemplate: '{0} Cluster Station {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + Lawyer: [ 1, 1 ] # Corvax-IAA + ServiceWorker: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 2, 2 ] + TechnicalAssistant: [ 2, 2 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 1, 1 ] + MedicalDoctor: [ 1, 1 ] + MedicalIntern: [ 2, 2 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1 , 1 ] + Scientist: [ 2, 2 ] + ResearchAssistant: [ 2, 2 ] + Borg: [ 1, 1 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 2, 2 ] + SecurityCadet: [ 2, 2 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 1, 1 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + ADTRoboticist: [ 1, 1 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/core.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/core.yml new file mode 100644 index 00000000000..44f67a9ac2c --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/core.yml @@ -0,0 +1,84 @@ +- type: gameMap + id: ADTCore + mapName: 'Core' + mapPath: /Maps/ADTMaps/adt_core.yml + minPlayers: 20 + maxPlayers: 125 + stations: + ADTCore: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Core {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml + - type: StationCargoShuttle + path: /Maps/Shuttles/cargo_core.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Bartender: [ 2, 2 ] + Botanist: [ 2, 2] + Chef: [ 1, 1 ] + Janitor: [ 2, 2 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 3, 3 ] + #engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 3, 3 ] + AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 2, 2 ] + SeniorEngineer: [ 1, 1 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 2, 3 ] + Chemist: [ 1, 2 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 2 ] + SeniorPhysician: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 2, 2 ] + ResearchAssistant: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + #security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 3, 3 ] + Warden: [ 1, 1 ] + Lawyer: [ 1, 1 ] + SecurityCadet: [ 1, 1 ] + Detective: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + #supply + CargoTechnician: [ 3, 3 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Boxer: [ 2, 2 ] + Reporter: [ 2, 2 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 1, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml new file mode 100644 index 00000000000..1cf659a9ee7 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml @@ -0,0 +1,71 @@ +- type: gameMap + id: ADTDelta + mapName: 'Delta Station' + mapPath: /Maps/ADTMaps/adt_delta.yml + minPlayers: 40 + stations: + Delta: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Дельта {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'TG' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxdelta.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + CargoTechnician: [ 4, 4 ] + Passenger: [ -1, -1 ] + Bartender: [ 1, 1 ] + Botanist: [ 3, 4 ] + Chef: [ 1, 2 ] + Clown: [ 1, 1 ] + Janitor: [ 1, 2 ] + Mime: [ 1, 1 ] + Zookeeper: [ 1, 1 ] + Captain: [ 1, 1 ] + IAA: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 5, 5 ] + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 5, 5 ] + Chemist: [ 2, 2 ] + ResearchDirector: [ 1, 1 ] + Scientist: [ 6, 6 ] + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 6, 6 ] + Chaplain: [ 1, 1 ] + Warden: [ 1, 1 ] + Librarian: [ 1, 1 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + Musician: [ 2, 2 ] + AtmosphericTechnician: [ 2, 3 ] + TechnicalAssistant: [ 3, 3 ] + ResearchAssistant: [ 3, 3 ] + Reporter: [ 2, 2 ] + MedicalIntern: [ 3, 3 ] + ServiceWorker: [ 3, 3 ] + SecurityCadet: [ 3, 3 ] + Psychologist: [ 1, 1 ] + Detective: [ 1, 1 ] + Paramedic: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + Lawyer: [1, 1] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTRoboticist: [ 1, 1 ] #ADT + #Senitors + SeniorOfficer: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml new file mode 100644 index 00000000000..83326ed044d --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml @@ -0,0 +1,81 @@ +- type: gameMap + id: ADTEuropa + mapName: 'Europa' + mapPath: /Maps/ADTMaps/adt_europa.yml + minPlayers: 0 + maxPlayers: 40 + stations: + ADTEuropa: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Europa {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_transit.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Bartender: [ 1, 1 ] + Botanist: [ 2, 2] + Chef: [ 1, 1 ] + Janitor: [ 2, 2 ] + Captain: [ 1, 1 ] + IAA: [ 2, 2 ] # Corvax-IAA + HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 3, 4 ] + #engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 2, 2 ] + AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 1, 2 ] + Chemist: [ 1, 2 ] + MedicalIntern: [ 1, 1 ] + Paramedic: [ 1, 2 ] + SeniorPhysician: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 1, 2 ] + ResearchAssistant: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + #security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 2, 2 ] + Warden: [ 1, 1 ] + Lawyer: [ 1, 1 ] # Corvax-IAA + SecurityCadet: [ 3, 3 ] + Detective: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + #supply + CargoTechnician: [ 3, 3 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Reporter: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + ADTRoboticist: [ 1, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt b/Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml new file mode 100644 index 00000000000..a86dfd63310 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml @@ -0,0 +1,82 @@ +- type: gameMap + id: ADTFland + mapName: 'Fland Installation' + mapPath: /Maps/ADTMaps/adt_fland.yml + minPlayers: 30 + stations: + ADTFland: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Fland Installation {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'B' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml + - type: StationCargoShuttle + path: /Maps/Shuttles/cargo_fland.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 4, 4 ] + Chef: [ 2, 2 ] + Janitor: [ 3, 3 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 4, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 3, 3 ] + MedicalDoctor: [ 5, 5 ] + Paramedic: [ 2, 2 ] + MedicalIntern: [ 4, 4 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + Scientist: [ 4, 4 ] + ResearchAssistant: [ 6, 6 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + SecurityOfficer: [ 7, 7 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 4, 4 ] + Lawyer: [ 2, 2 ] # Corvax-IAA + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 4, 4 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 1, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml new file mode 100644 index 00000000000..c886886ec54 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml @@ -0,0 +1,82 @@ +- type: gameMap + id: ADTMarathon + mapName: 'Marathon Station' + mapPath: /Maps/ADTMaps/adt_marathon.yml + minPlayers: 20 + maxPlayers: 125 + stations: + ADTMarathon: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Marathon Station {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 2, 3 ] + Chef: [ 2, 2 ] + Janitor: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 3, 3 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 4, 4 ] + MedicalIntern: [ 3, 3 ] + Psychologist: [ 1, 1 ] + Paramedic: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 4 ] + ResearchAssistant: [ 3, 3 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 4, 4 ] + Lawyer: [ 2, 2 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + ADTRoboticist: [ 2, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml new file mode 100644 index 00000000000..65dd976716e --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml @@ -0,0 +1,80 @@ +- type: gameMap + id: ADTMeta + mapName: 'Meta Station' + mapPath: /Maps/ADTMaps/adt_meta.yml + minPlayers: 30 + stations: + ADTMeta: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Meta Station {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'TG' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 2, 3 ] + Chef: [ 2, 2 ] + Janitor: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 4, 6 ] + TechnicalAssistant: [ 3, 6 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 3, 3 ] + MedicalDoctor: [ 4, 4 ] + MedicalIntern: [ 3, 6 ] + Paramedic: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + Scientist: [ 4, 6 ] + ResearchAssistant: [ 3, 6 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + SecurityOfficer: [ 4, 6 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 3, 6 ] + Lawyer: [ 2, 2 ] # Corvax-IAA + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 1, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml new file mode 100644 index 00000000000..3a161812a16 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml @@ -0,0 +1,80 @@ +- type: gameMap + id: ADTOmega + mapName: 'Omega' + mapPath: /Maps/ADTMaps/adt_omega.yml + minPlayers: 10 + maxPlayers: 35 + stations: + ADTOmega: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Omega Station {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'TG' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 2, 2 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] + MedicalIntern: [ 2, 2 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Borg: [ 2, 2 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + ADTRoboticist: [ 1, 1 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml new file mode 100644 index 00000000000..d425c605f41 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml @@ -0,0 +1,83 @@ +- type: gameMap + id: ADTOrigin + mapName: 'Origin' + mapPath: /Maps/ADTMaps/adt_origin.yml + minPlayers: 30 + stations: + ADTOrigin: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Origin {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 3, 3 ] + Chef: [ 3, 3 ] + Janitor: [ 3, 3 ] + Chaplain: [ 2, 2 ] + Librarian: [ 2, 2 ] + Lawyer: [ 2, 2 ] # Corvax-IAA + ServiceWorker: [ 3, 4 ] + #engineering + ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 5, 5 ] + TechnicalAssistant: [ 2, 3 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 2, 3 ] + Paramedic: [ 1, 1 ] + MedicalDoctor: [ 5, 5 ] + Psychologist: [ 1, 1 ] + MedicalIntern: [ 1, 2 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + Scientist: [ 5, 5 ] + ResearchAssistant: [ 4, 4 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 6, 6 ] + SecurityCadet: [ 2, 4 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 5, 5 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 2, 2 ] + Boxer: [ 1, 1 ] + Reporter: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 1, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml new file mode 100644 index 00000000000..54c42090f62 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml @@ -0,0 +1,79 @@ +- type: gameMap + id: ADTPacked + mapName: 'Packed' + mapPath: /Maps/ADTMaps/adt_packed.yml + minPlayers: 0 + maxPlayers: 40 + stations: + ADTPacked: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Packed {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'VG' + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 3, 3 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 2, 2 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + Scientist: [ 3, 3 ] + ResearchAssistant: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + SecurityOfficer: [ 3, 3 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] # Corvax-IAA + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Borg: [ 1 , 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTPathologist: [ 1 , 1] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 1, 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml new file mode 100644 index 00000000000..f07b6f87537 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml @@ -0,0 +1,80 @@ +- type: gameMap + id: ADTSaltern + mapName: 'Saltern' + mapPath: /Maps/ADTMaps/adt_saltern.yml + minPlayers: 0 + maxPlayers: 40 + fallback: true + stations: + ADTSaltern: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Saltern {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] + SeniorEngineer: [1, 1 ] + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 4, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 2, 2 ] + MedicalIntern: [ 4, 4 ] + #science + ResearchDirector: [ 1, 1 ] + SeniorResearcher: [1, 1 ] + Scientist: [ 3, 3 ] + ResearchAssistant: [ 2, 2 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + SecurityOfficer: [ 3, 3 ] + SecurityCadet: [ 4, 4 ] + Lawyer: [2, 2] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 1, 3 ] + CargoTechnician: [ 2, 2 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + ADTRoboticist: [ 1, 1 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/train.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/train.yml new file mode 100644 index 00000000000..9eee9630618 --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/train.yml @@ -0,0 +1,82 @@ +- type: gameMap + id: ADTTrain + mapName: 'Train' + mapPath: /Maps/ADTMaps/adt_train.yml + minPlayers: 10 + maxPlayers: 70 + stations: + ADTTrain: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: 'Train "Sentipode" {0}-{1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'ED' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # To do - add railway station + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 2, 2 ] + Botanist: [ 3, 3 ] + Chef: [ 2, 2 ] + Janitor: [ 3, 3 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 4, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] + Paramedic: [ 1, 1 ] + MedicalIntern: [ 4, 4 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 5, 5 ] + ResearchAssistant: [ 4, 4 ] + Borg: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 4, 4 ] + Lawyer: [ 2, 2 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Reporter: [ 2, 2 ] + #ADT + Brigmedic: [ 1, 1 ] + ADTBlueShieldOfficer: [ 1, 1 ] + Magistrat: [ 1, 1 ] + ADTInvestigator: [ 1, 1 ] #ADT + ADTSecurityCyborg: [ 1, 1 ] #ADT + ADTEngiBorg: [ 1, 1 ] #ADT + ADTJanitorBorg: [ 1, 1 ] #ADT + ADTMedicalBorg: [ 1, 1 ] #ADT + ADTServiseBorg: [ 1, 1 ] #ADT + ADTSupplyBorg: [ 1, 1 ] #ADT + IAA: [ 1, 1 ] # Corvax-IAA + SeniorEngineer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + ADTRoboticist: [ 2, 2 ] #ADT + ADTPathologist: [ 1 , 1 ] #ADT From 60a9b72d482deb2a303f755d9fc3b270de1a31a5 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:07:27 +0000 Subject: [PATCH 62/75] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC=20=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D1=8B=20=D1=80=D0=BE=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Maps/atlas.yml | 1 + Resources/Prototypes/Maps/bagel.yml | 1 + Resources/Prototypes/Maps/box.yml | 2 +- Resources/Prototypes/Maps/cluster.yml | 2 +- Resources/Prototypes/Maps/core.yml | 1 + Resources/Prototypes/Maps/europa.yml | 1 + Resources/Prototypes/Maps/fland.yml | 1 + Resources/Prototypes/Maps/marathon.yml | 1 + Resources/Prototypes/Maps/meta.yml | 1 + Resources/Prototypes/Maps/oasis.yml | 1 + Resources/Prototypes/Maps/omega.yml | 1 + Resources/Prototypes/Maps/origin.yml | 2 +- Resources/Prototypes/Maps/packed.yml | 1 + Resources/Prototypes/Maps/saltern.yml | 2 +- Resources/Prototypes/Maps/train.yml | 1 + 15 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index 6fe3eff030a..ecdb1aed730 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -55,3 +55,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + ADTPathologist: [ 1 , 1] #ADT diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 0bd4714e3ec..d1202fc08ec 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -61,3 +61,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index ecd4ef07404..b34972138d2 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -60,4 +60,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 8485b068f8d..82811618be6 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -59,4 +59,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index e531579b336..93ef0cd5171 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -64,3 +64,4 @@ Musician: [ 1, 1 ] Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 84961a3874b..f951b6b786b 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -62,3 +62,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 97ed26c8ec9..ebc87d9b9c5 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -61,3 +61,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index d3968c369a1..777ca1cc55c 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -61,3 +61,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 67600c501d6..c31ad13b5cc 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -59,3 +59,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index d11a1217d90..c9c43098f99 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -62,3 +62,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index b4df9c756da..c4ef303184f 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -59,3 +59,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index fa7c6435577..3899c2a92dd 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -62,4 +62,4 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] - + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index fdffc03fcd6..959e5f91bbf 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -58,3 +58,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 1 , 1 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index e49fde94efa..279d601440f 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -59,4 +59,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 46492e80f06..9e16565b13b 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -61,3 +61,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file From ade5dd3da366c4c53b438ac8cd56e061c7fac451 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:20:21 +0000 Subject: [PATCH 63/75] =?UTF-8?q?Revert=20"=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=82=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=D0=B0=20=D0=B8=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D1=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 72e02e1641f2fafc01478583f11907f82779c8c3. --- .../Prototypes/ADT/Maps/ADTMaps/atlas.yml | 78 ----------------- .../Prototypes/ADT/Maps/ADTMaps/avrite.yml | 73 ---------------- .../Prototypes/ADT/Maps/ADTMaps/bagel.yml | 82 ------------------ Resources/Prototypes/ADT/Maps/ADTMaps/box.yml | 81 ------------------ .../Prototypes/ADT/Maps/ADTMaps/cluster.yml | 80 ------------------ .../Prototypes/ADT/Maps/ADTMaps/core.yml | 84 ------------------- .../Prototypes/ADT/Maps/ADTMaps/delta.yml | 71 ---------------- .../Prototypes/ADT/Maps/ADTMaps/europa.yml | 81 ------------------ .../Prototypes/ADT/Maps/ADTMaps/fill.txt | 1 + .../Prototypes/ADT/Maps/ADTMaps/fland.yml | 82 ------------------ .../Prototypes/ADT/Maps/ADTMaps/marathon.yml | 82 ------------------ .../Prototypes/ADT/Maps/ADTMaps/meta.yml | 80 ------------------ .../Prototypes/ADT/Maps/ADTMaps/omega.yml | 80 ------------------ .../Prototypes/ADT/Maps/ADTMaps/origin.yml | 83 ------------------ .../Prototypes/ADT/Maps/ADTMaps/packed.yml | 79 ----------------- .../Prototypes/ADT/Maps/ADTMaps/saltern.yml | 80 ------------------ .../Prototypes/ADT/Maps/ADTMaps/train.yml | 82 ------------------ 17 files changed, 1 insertion(+), 1278 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/box.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/core.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml create mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml delete mode 100644 Resources/Prototypes/ADT/Maps/ADTMaps/train.yml diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml deleted file mode 100644 index 9e285afce4e..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml +++ /dev/null @@ -1,78 +0,0 @@ -- type: gameMap - id: ADTAtlas - mapName: Atlas - mapPath: /Maps/ADTMaps/adt_atlas.yml - minPlayers: 0 - maxPlayers: 20 - stations: - ADTAtlas: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Atlas {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'R4' # R4407/Goon. GS isn't as cool sounding. - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 1, 1 ] - Botanist: [ 2, 2 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 1 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 1, 1 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 2, 2 ] - TechnicalAssistant: [ 1, 3 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - Chemist: [ 1, 1 ] - MedicalDoctor: [ 2, 2 ] - MedicalIntern: [ 1, 3 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 2, 2 ] - ResearchAssistant: [ 1, 3 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SecurityOfficer: [ 3, 3 ] - SecurityCadet: [ 1, 3 ] - Detective: [ 1, 1 ] - Lawyer: [1, 1] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 2, 2 ] - #civillian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - SeniorEngineer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - ADTRoboticist: [ 1, 1 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml deleted file mode 100644 index e9f29672dc0..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/avrite.yml +++ /dev/null @@ -1,73 +0,0 @@ -- type: gameMap - id: ADTAvrite - mapName: 'Avrite Station' - mapPath: /Maps/ADTMaps/adt_avrite.yml - minPlayers: 40 - stations: - ADTAvrite: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Avrite {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'TG' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxavrit.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - CargoTechnician: [ 4, 4 ] - Passenger: [ -1, -1 ] - Bartender: [ 2, 2 ] - Botanist: [ 3, 3 ] - Chef: [ 2, 2 ] - Clown: [ 1, 1 ] - Janitor: [ 3, 3 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - IAA: [ 1, 1 ] - Reporter: [ 2, 2 ] - HeadOfPersonnel: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 4, 4 ] - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 4, 4 ] - Chemist: [ 3, 3 ] - Zookeeper: [ 1, 1 ] - ResearchDirector: [ 1, 1 ] - Scientist: [ 6, 6 ] - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 6, 6 ] - Chaplain: [ 1, 1 ] - Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 4, 4 ] - Musician: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - TechnicalAssistant: [ 4, 4 ] - ResearchAssistant: [ 5, 5 ] - MedicalIntern: [ 4, 4 ] - ServiceWorker: [ 4, 4 ] - SecurityCadet: [ 4, 4 ] - Psychologist: [ 1, 1 ] - Detective: [ 1, 1 ] - Boxer: [ 2, 2] - Paramedic: [ 1, 1 ] - Borg: [ 2, 2 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - Lawyer: [1, 1] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTRoboticist: [ 1, 1 ] #ADT - #Senitors - SeniorOfficer: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml deleted file mode 100644 index da761788996..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/bagel.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: gameMap - id: ADTBagel - mapName: 'Bagel Station' - mapPath: /Maps/ADTMaps/adt_bagel.yml - minPlayers: 20 - maxPlayers: 150 - stations: - ADTBagel: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Bagel Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 3, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 3, 3 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - Chemist: [ 2, 2 ] - MedicalDoctor: [ 3, 3 ] - Paramedic: [ 1, 1 ] - MedicalIntern: [ 4, 4 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SecurityOfficer: [ 4, 4 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 3 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Reporter: [ 2, 2 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - SeniorEngineer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - ADTRoboticist: [ 2, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml deleted file mode 100644 index 7e64717d29e..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/box.yml +++ /dev/null @@ -1,81 +0,0 @@ -- type: gameMap - id: ADTBox - mapName: 'Box Station' - mapPath: /Maps/ADTMaps/adt_box.yml - minPlayers: 20 - stations: - ADTBox: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Box Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'TG' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 3, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 2, 2 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 2, 3 ] - MedicalDoctor: [ 3, 3 ] - Paramedic: [ 1, 1 ] - MedicalIntern: [ 4, 4 ] - Psychologist: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Scientist: [ 4, 4 ] - ResearchAssistant: [ 4, 4 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SecurityOfficer: [ 4, 4 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] # Corvax-IAA - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 3 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 2, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml deleted file mode 100644 index abded692c9e..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/cluster.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: gameMap - id: ADTCluster - mapName: 'Cluster' - mapPath: /Maps/ADTMaps/adt_cluster.yml - minPlayers: 0 - maxPlayers: 45 - stations: - ADTCluster: - stationProto: StandardNanotrasenStation - components: - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_transit.yml - - type: StationNameSetup - mapNameTemplate: '{0} Cluster Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 1, 1 ] - Botanist: [ 2, 2 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 1 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - Lawyer: [ 1, 1 ] # Corvax-IAA - ServiceWorker: [ 1, 1 ] - #engineering - ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 2, 2 ] - TechnicalAssistant: [ 2, 2 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 1, 1 ] - MedicalDoctor: [ 1, 1 ] - MedicalIntern: [ 2, 2 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1 , 1 ] - Scientist: [ 2, 2 ] - ResearchAssistant: [ 2, 2 ] - Borg: [ 1, 1 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - Detective: [ 1, 1 ] - SecurityOfficer: [ 2, 2 ] - SecurityCadet: [ 2, 2 ] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 1, 1 ] - #civillian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - ADTRoboticist: [ 1, 1 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/core.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/core.yml deleted file mode 100644 index 44f67a9ac2c..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/core.yml +++ /dev/null @@ -1,84 +0,0 @@ -- type: gameMap - id: ADTCore - mapName: 'Core' - mapPath: /Maps/ADTMaps/adt_core.yml - minPlayers: 20 - maxPlayers: 125 - stations: - ADTCore: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Core {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml - - type: StationCargoShuttle - path: /Maps/Shuttles/cargo_core.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Bartender: [ 2, 2 ] - Botanist: [ 2, 2] - Chef: [ 1, 1 ] - Janitor: [ 2, 2 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 3, 3 ] - #engineering - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 3, 3 ] - AtmosphericTechnician: [ 2, 2 ] - TechnicalAssistant: [ 2, 2 ] - SeniorEngineer: [ 1, 1 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 2, 3 ] - Chemist: [ 1, 2 ] - MedicalIntern: [ 2, 2 ] - Paramedic: [ 1, 2 ] - SeniorPhysician: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 2, 2 ] - ResearchAssistant: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - #security - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 3, 3 ] - Warden: [ 1, 1 ] - Lawyer: [ 1, 1 ] - SecurityCadet: [ 1, 1 ] - Detective: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - #supply - CargoTechnician: [ 3, 3 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 2, 2 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Boxer: [ 2, 2 ] - Reporter: [ 2, 2 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 1, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml deleted file mode 100644 index 1cf659a9ee7..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/delta.yml +++ /dev/null @@ -1,71 +0,0 @@ -- type: gameMap - id: ADTDelta - mapName: 'Delta Station' - mapPath: /Maps/ADTMaps/adt_delta.yml - minPlayers: 40 - stations: - Delta: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Дельта {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'TG' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_corvaxdelta.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - CargoTechnician: [ 4, 4 ] - Passenger: [ -1, -1 ] - Bartender: [ 1, 1 ] - Botanist: [ 3, 4 ] - Chef: [ 1, 2 ] - Clown: [ 1, 1 ] - Janitor: [ 1, 2 ] - Mime: [ 1, 1 ] - Zookeeper: [ 1, 1 ] - Captain: [ 1, 1 ] - IAA: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 5, 5 ] - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 5, 5 ] - Chemist: [ 2, 2 ] - ResearchDirector: [ 1, 1 ] - Scientist: [ 6, 6 ] - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 6, 6 ] - Chaplain: [ 1, 1 ] - Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - Musician: [ 2, 2 ] - AtmosphericTechnician: [ 2, 3 ] - TechnicalAssistant: [ 3, 3 ] - ResearchAssistant: [ 3, 3 ] - Reporter: [ 2, 2 ] - MedicalIntern: [ 3, 3 ] - ServiceWorker: [ 3, 3 ] - SecurityCadet: [ 3, 3 ] - Psychologist: [ 1, 1 ] - Detective: [ 1, 1 ] - Paramedic: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - Lawyer: [1, 1] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTRoboticist: [ 1, 1 ] #ADT - #Senitors - SeniorOfficer: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml deleted file mode 100644 index 83326ed044d..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/europa.yml +++ /dev/null @@ -1,81 +0,0 @@ -- type: gameMap - id: ADTEuropa - mapName: 'Europa' - mapPath: /Maps/ADTMaps/adt_europa.yml - minPlayers: 0 - maxPlayers: 40 - stations: - ADTEuropa: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Europa {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_transit.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Bartender: [ 1, 1 ] - Botanist: [ 2, 2] - Chef: [ 1, 1 ] - Janitor: [ 2, 2 ] - Captain: [ 1, 1 ] - IAA: [ 2, 2 ] # Corvax-IAA - HeadOfPersonnel: [ 1, 1 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 3, 4 ] - #engineering - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 2, 2 ] - AtmosphericTechnician: [ 2, 2 ] - TechnicalAssistant: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 1, 2 ] - Chemist: [ 1, 2 ] - MedicalIntern: [ 1, 1 ] - Paramedic: [ 1, 2 ] - SeniorPhysician: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 1, 2 ] - ResearchAssistant: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - #security - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 2, 2 ] - Warden: [ 1, 1 ] - Lawyer: [ 1, 1 ] # Corvax-IAA - SecurityCadet: [ 3, 3 ] - Detective: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - #supply - CargoTechnician: [ 3, 3 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Reporter: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - ADTRoboticist: [ 1, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt b/Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt new file mode 100644 index 00000000000..b4954caf47d --- /dev/null +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/fill.txt @@ -0,0 +1 @@ +# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml deleted file mode 100644 index a86dfd63310..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/fland.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: gameMap - id: ADTFland - mapName: 'Fland Installation' - mapPath: /Maps/ADTMaps/adt_fland.yml - minPlayers: 30 - stations: - ADTFland: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Fland Installation {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'B' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml - - type: StationCargoShuttle - path: /Maps/Shuttles/cargo_fland.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 4, 4 ] - Chef: [ 2, 2 ] - Janitor: [ 3, 3 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 3, 3 ] - MedicalDoctor: [ 5, 5 ] - Paramedic: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Scientist: [ 4, 4 ] - ResearchAssistant: [ 6, 6 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SecurityOfficer: [ 7, 7 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] # Corvax-IAA - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 4, 4 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 1, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml deleted file mode 100644 index c886886ec54..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/marathon.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: gameMap - id: ADTMarathon - mapName: 'Marathon Station' - mapPath: /Maps/ADTMaps/adt_marathon.yml - minPlayers: 20 - maxPlayers: 125 - stations: - ADTMarathon: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Marathon Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 2, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 1, 2 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 3, 3 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - Chemist: [ 2, 2 ] - MedicalDoctor: [ 4, 4 ] - MedicalIntern: [ 3, 3 ] - Psychologist: [ 1, 1 ] - Paramedic: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 4, 4 ] - ResearchAssistant: [ 3, 3 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SecurityOfficer: [ 4, 4 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 3 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - SeniorEngineer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - ADTRoboticist: [ 2, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml deleted file mode 100644 index 65dd976716e..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/meta.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: gameMap - id: ADTMeta - mapName: 'Meta Station' - mapPath: /Maps/ADTMaps/adt_meta.yml - minPlayers: 30 - stations: - ADTMeta: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Meta Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'TG' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 2, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 1, 2 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 6 ] - TechnicalAssistant: [ 3, 6 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 3, 3 ] - MedicalDoctor: [ 4, 4 ] - MedicalIntern: [ 3, 6 ] - Paramedic: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Scientist: [ 4, 6 ] - ResearchAssistant: [ 3, 6 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SecurityOfficer: [ 4, 6 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 3, 6 ] - Lawyer: [ 2, 2 ] # Corvax-IAA - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 3 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 1, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml deleted file mode 100644 index 3a161812a16..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/omega.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: gameMap - id: ADTOmega - mapName: 'Omega' - mapPath: /Maps/ADTMaps/adt_omega.yml - minPlayers: 10 - maxPlayers: 35 - stations: - ADTOmega: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Omega Station {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'TG' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 1, 1 ] - Botanist: [ 2, 2 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 2 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 3, 3 ] - TechnicalAssistant: [ 2, 2 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - Chemist: [ 2, 2 ] - MedicalDoctor: [ 3, 3 ] - MedicalIntern: [ 2, 2 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 4, 4 ] - ResearchAssistant: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SecurityOfficer: [ 4, 4 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 2, 2 ] - Lawyer: [ 1, 1 ] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 2, 2 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Borg: [ 2, 2 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - SeniorEngineer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - ADTRoboticist: [ 1, 1 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml deleted file mode 100644 index d425c605f41..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/origin.yml +++ /dev/null @@ -1,83 +0,0 @@ -- type: gameMap - id: ADTOrigin - mapName: 'Origin' - mapPath: /Maps/ADTMaps/adt_origin.yml - minPlayers: 30 - stations: - ADTOrigin: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Origin {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 3, 3 ] - Chef: [ 3, 3 ] - Janitor: [ 3, 3 ] - Chaplain: [ 2, 2 ] - Librarian: [ 2, 2 ] - Lawyer: [ 2, 2 ] # Corvax-IAA - ServiceWorker: [ 3, 4 ] - #engineering - ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 5, 5 ] - TechnicalAssistant: [ 2, 3 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 2, 3 ] - Paramedic: [ 1, 1 ] - MedicalDoctor: [ 5, 5 ] - Psychologist: [ 1, 1 ] - MedicalIntern: [ 1, 2 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - Detective: [ 1, 1 ] - SecurityOfficer: [ 6, 6 ] - SecurityCadet: [ 2, 4 ] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 5, 5 ] - #civillian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 2, 2 ] - Boxer: [ 1, 1 ] - Reporter: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 1, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml deleted file mode 100644 index 54c42090f62..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/packed.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: gameMap - id: ADTPacked - mapName: 'Packed' - mapPath: /Maps/ADTMaps/adt_packed.yml - minPlayers: 0 - maxPlayers: 40 - stations: - ADTPacked: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Packed {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'VG' - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 1, 1 ] - Botanist: [ 2, 2 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 2 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 3, 3 ] - TechnicalAssistant: [ 3, 3 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 2, 2 ] - MedicalDoctor: [ 2, 2 ] - MedicalIntern: [ 2, 2 ] - Paramedic: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Scientist: [ 3, 3 ] - ResearchAssistant: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SecurityOfficer: [ 3, 3 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 2, 2 ] - Lawyer: [ 1, 1 ] # Corvax-IAA - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 2, 2 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Borg: [ 1 , 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTPathologist: [ 1 , 1] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 1, 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml deleted file mode 100644 index f07b6f87537..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/saltern.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: gameMap - id: ADTSaltern - mapName: 'Saltern' - mapPath: /Maps/ADTMaps/adt_saltern.yml - minPlayers: 0 - maxPlayers: 40 - fallback: true - stations: - ADTSaltern: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Saltern {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency.yml - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 1, 1 ] - Botanist: [ 2, 2 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 1 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - SeniorEngineer: [1, 1 ] - StationEngineer: [ 3, 3 ] - TechnicalAssistant: [ 4, 4 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - Chemist: [ 2, 2 ] - MedicalDoctor: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] - #science - ResearchDirector: [ 1, 1 ] - SeniorResearcher: [1, 1 ] - Scientist: [ 3, 3 ] - ResearchAssistant: [ 2, 2 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SecurityOfficer: [ 3, 3 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [2, 2] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 1, 3 ] - CargoTechnician: [ 2, 2 ] - #civillian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - ADTRoboticist: [ 1, 1 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/train.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/train.yml deleted file mode 100644 index 9eee9630618..00000000000 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/train.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: gameMap - id: ADTTrain - mapName: 'Train' - mapPath: /Maps/ADTMaps/adt_train.yml - minPlayers: 10 - maxPlayers: 70 - stations: - ADTTrain: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: 'Train "Sentipode" {0}-{1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'ED' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # To do - add railway station - - type: StationJobs - overflowJobs: - - Passenger - availableJobs: - #service - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] - Botanist: [ 3, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 3, 3 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] - Chemist: [ 2, 2 ] - MedicalDoctor: [ 3, 3 ] - Paramedic: [ 1, 1 ] - MedicalIntern: [ 4, 4 ] - #science - ResearchDirector: [ 1, 1 ] - Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] - Borg: [ 2, 2 ] - #security - HeadOfSecurity: [ 1, 1 ] - Warden: [ 1, 1 ] - SecurityOfficer: [ 4, 4 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] - #supply - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 3 ] - #civilian - Passenger: [ -1, -1 ] - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Reporter: [ 2, 2 ] - #ADT - Brigmedic: [ 1, 1 ] - ADTBlueShieldOfficer: [ 1, 1 ] - Magistrat: [ 1, 1 ] - ADTInvestigator: [ 1, 1 ] #ADT - ADTSecurityCyborg: [ 1, 1 ] #ADT - ADTEngiBorg: [ 1, 1 ] #ADT - ADTJanitorBorg: [ 1, 1 ] #ADT - ADTMedicalBorg: [ 1, 1 ] #ADT - ADTServiseBorg: [ 1, 1 ] #ADT - ADTSupplyBorg: [ 1, 1 ] #ADT - IAA: [ 1, 1 ] # Corvax-IAA - SeniorEngineer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - ADTRoboticist: [ 2, 2 ] #ADT - ADTPathologist: [ 1 , 1 ] #ADT From 01092842e3be9ae28be8ba6d2282e1269aee6ccd Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:25:53 +0000 Subject: [PATCH 64/75] =?UTF-8?q?Revert=20"=D0=B5=D1=89=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B=20=D1=80=D0=BE=D0=BB=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 60a9b72d482deb2a303f755d9fc3b270de1a31a5. --- Resources/Prototypes/Maps/atlas.yml | 1 - Resources/Prototypes/Maps/bagel.yml | 1 - Resources/Prototypes/Maps/box.yml | 2 +- Resources/Prototypes/Maps/cluster.yml | 2 +- Resources/Prototypes/Maps/core.yml | 1 - Resources/Prototypes/Maps/europa.yml | 1 - Resources/Prototypes/Maps/fland.yml | 1 - Resources/Prototypes/Maps/marathon.yml | 1 - Resources/Prototypes/Maps/meta.yml | 1 - Resources/Prototypes/Maps/oasis.yml | 1 - Resources/Prototypes/Maps/omega.yml | 1 - Resources/Prototypes/Maps/origin.yml | 2 +- Resources/Prototypes/Maps/packed.yml | 1 - Resources/Prototypes/Maps/saltern.yml | 2 +- Resources/Prototypes/Maps/train.yml | 1 - 15 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index ecdb1aed730..6fe3eff030a 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -55,4 +55,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index d1202fc08ec..0bd4714e3ec 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -61,4 +61,3 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index b34972138d2..ecd4ef07404 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -60,4 +60,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file + diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 82811618be6..8485b068f8d 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -59,4 +59,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file + diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 93ef0cd5171..e531579b336 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -64,4 +64,3 @@ Musician: [ 1, 1 ] Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index f951b6b786b..84961a3874b 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -62,4 +62,3 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index ebc87d9b9c5..97ed26c8ec9 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -61,4 +61,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 777ca1cc55c..d3968c369a1 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -61,4 +61,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index c31ad13b5cc..67600c501d6 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -59,4 +59,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index c9c43098f99..d11a1217d90 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -62,4 +62,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index c4ef303184f..b4df9c756da 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -59,4 +59,3 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 3899c2a92dd..fa7c6435577 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -62,4 +62,4 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file + diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 959e5f91bbf..fdffc03fcd6 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -58,4 +58,3 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 1 , 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index 279d601440f..e49fde94efa 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -59,4 +59,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file + diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 9e16565b13b..46492e80f06 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -61,4 +61,3 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] - ADTPathologist: [ 1 , 1] #ADT \ No newline at end of file From 3e7e098df3633a8865f0f98898a703dfc123073e Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:35:34 +0000 Subject: [PATCH 65/75] =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D1=8B=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=20adt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Job/job-description.ftl | 1 + Resources/Locale/ru-RU/ADT/Job/job-names.ftl | 1 + Resources/Locale/ru-RU/job/job-description.ftl | 2 -- Resources/Locale/ru-RU/job/job-names.ftl | 6 +----- 4 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Job/job-description.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Job/job-names.ftl diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl new file mode 100644 index 00000000000..7b705bba266 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl @@ -0,0 +1 @@ +job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl new file mode 100644 index 00000000000..84b215c303c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -0,0 +1 @@ +job-name-ADTPathologist = Патологоанатом \ No newline at end of file diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index 8acc492b758..a2deba9868e 100644 --- a/Resources/Locale/ru-RU/job/job-description.ftl +++ b/Resources/Locale/ru-RU/job/job-description.ftl @@ -46,5 +46,3 @@ job-description-serviceworker = Изучите основы барменског job-description-visitor = Наслаждайтесь своим визитом на станцию. job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключённые были оформлены и выпущены по окончании срока. job-description-zookeeper = Устройте весёлое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite. -# ADT -job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index adb3317a54f..9f9244ebf50 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -46,8 +46,6 @@ job-name-ertjanitor = уборщик ОБР job-name-boxer = боксёр job-name-zookeeper = зоотехник job-name-visitor = посетитель -# ADT -job-name-ADTPathologist = Патологоанатом # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = атмосферный техник @@ -97,6 +95,4 @@ JobTechnicalAssistant = технический ассистент JobWarden = смотритель JobVisitor = посетитель JobBoxer = боксёр -JobZookeeper = зоотехник -# ADT -JobADTPathologist = Патологоанатом \ No newline at end of file +JobZookeeper = зоотехник \ No newline at end of file From 14d3bf58a3716b43622dda3f1cbf59d889fc0ce2 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:42:14 +0000 Subject: [PATCH 66/75] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D1=80=D1=8E=D0=BA=D0=B7=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=B2=20adt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Catalog/Fills/Backpacks/Startegear}/backpack.ftl | 2 +- .../Catalog/Fills/Backpacks/Startegear}/duffelbag.ftl | 0 .../Catalog/Fills/Backpacks/Startegear}/satchel.ftl | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Locale/ru-RU/{ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear => ADT/Catalog/Fills/Backpacks/Startegear}/backpack.ftl (59%) rename Resources/Locale/ru-RU/{ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear => ADT/Catalog/Fills/Backpacks/Startegear}/duffelbag.ftl (100%) rename Resources/Locale/ru-RU/{ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear => ADT/Catalog/Fills/Backpacks/Startegear}/satchel.ftl (100%) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/backpack.ftl similarity index 59% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl rename to Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/backpack.ftl index 49ee2cdc873..458d50573b2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/backpack.ftl +++ b/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/backpack.ftl @@ -1,2 +1,2 @@ ent-ADTClothingBackpackPathologistFilled = { ent-ADTClothingBackpackPathologist } - .desc = { ent-ADTClothingBackpackPathologist.desc } + .desc = { ent-ADTClothingBackpackPathologist.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/duffelbag.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/duffelbag.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/duffelbag.ftl rename to Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/duffelbag.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/satchel.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/satchel.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/backpacks/startegear/satchel.ftl rename to Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/Startegear/satchel.ftl From bf81b5569cd6d96a3e2cb23d58172215a8178f33 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:44:03 +0000 Subject: [PATCH 67/75] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D1=8F=D1=89=D0=B8=D0=BA=D0=B0=20=D0=B2=20adt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fills/lockers => ADT/Catalog/Fills/Lockers}/biohazard.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/{ss14-ru/prototypes/adt/catalog/fills/lockers => ADT/Catalog/Fills/Lockers}/biohazard.ftl (100%) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Fills/Lockers/biohazard.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/adt/catalog/fills/lockers/biohazard.ftl rename to Resources/Locale/ru-RU/ADT/Catalog/Fills/Lockers/biohazard.ftl From 0be3bc6f9af74329aeab943631a4aab764cb7379 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:46:19 +0000 Subject: [PATCH 68/75] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=B2=20adt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl | 2 ++ .../ss14-ru/prototypes/entities/markers/spawners/jobs.ftl | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl diff --git a/Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl new file mode 100644 index 00000000000..e8aef1d1ff6 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl @@ -0,0 +1,2 @@ +ent-ADTSpawnPointJobBase = патологоанатом + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 1ebd6d8e974..c030ef4e119 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -96,7 +96,4 @@ ent-SpawnPointReporter = репортёр ent-SpawnPointPsychologist = психолог .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointZookeeper = зоотехник - .desc = { ent-SpawnPointJobBase.desc } -# ADT -ent-ADTSpawnPointJobBase = патологоанатом .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file From 2c56ddb5ff6dd81c7f35807d58f8268b12364ec6 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:48:07 +0000 Subject: [PATCH 69/75] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=9A=D0=9F=D0=9A=20=D0=B2=20adt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl | 2 ++ .../ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl new file mode 100644 index 00000000000..e3d91b8b990 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Objects/Device/pda.ftl @@ -0,0 +1,2 @@ +ent-ADTPathologistPDA = КПК патологоанатома + .desc = От него веет прохладой. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 33937ea030d..444ff5b7dfb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -85,9 +85,6 @@ ent-ClearPDA = прозрачный КПК ent-SyndiPDA = кроваво-красный КПК .suffix = КПК Синдиката, Ядерный Оперативник .desc = Смотря на этот КПК, ваше сердцебиение учащается... словно его владелец совершил нечто ужасное. -# ADT -ent-ADTPathologistPDA = КПК патологоанатома - .desc = От него веет прохладой. # Corvax-HiddenDesc-End From 69c80167a14a86c6456203094fc2770ebc3d74d2 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:50:09 +0000 Subject: [PATCH 70/75] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=B0=D0=B9=D0=B4=D0=B8=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B2=20adt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl | 2 ++ .../entities/objects/misc/identification_cards.ftl | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl new file mode 100644 index 00000000000..9c149ba9471 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-ADTPathologistIDCard = ID карта патологоанатома + .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index 2aa125d31ae..e35e8a90885 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -125,7 +125,4 @@ ent-SeniorOfficerIDCard = ID карта инструктора СБ .desc = { ent-SecurityIDCard.desc } ent-UniversalIDCard = универсальная ID карта .desc = ID карта, которая позволит вам осуществить свои самые сокровенные желания. - .suffix = Админ -# ADT -ent-ADTPathologistIDCard = ID карта патологоанатома - .desc = { ent-IDCardStandard.desc } \ No newline at end of file + .suffix = Админ \ No newline at end of file From a8d81754a0f76ed3d67e867c1c5826650dbb6535 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:31:57 +0000 Subject: [PATCH 71/75] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=20=D1=88=D0=BA=D0=B0=D1=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Fills/Lockers/biohazard.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index 9d2acca0038..2d9641b67ac 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,10 +1,9 @@ - #- type: entity - # parent: ADTClosetLPathologist - # id: ADTClosetLPathologistFilled - # suffix: Filled, Pathologist - # components: - # - type: StorageFill - # contents: - # - id: ADTClothingOuterBioPathologist - # - id: ADTClothingHeadHatHoodBioPathologist - +- type: entity + id: ADTClosetL3PathologistFilled + suffix: Filled, Pathologist + parent: ADTClosetL3Pathologist + components: + - type: StorageFill + contents: + - id: ADTClothingOuterBioPathologist + - id: ADTClothingHeadHatHoodBioPathologist \ No newline at end of file From b4b97005992c83685430faa9ea6ee218041e8443 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:47:23 +0000 Subject: [PATCH 72/75] =?UTF-8?q?=D1=87=D0=B8=D0=BD=D0=B8=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Fills/Lockers/biohazard.yml | 4 ++-- .../Storage/Closets/Lockers /lockers.yml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index 2d9641b67ac..b7caccffce7 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,7 +1,7 @@ - type: entity - id: ADTClosetL3PathologistFilled + id: ADTClosetLPathologistFilled suffix: Filled, Pathologist - parent: ADTClosetL3Pathologist + parent: ADTClosetLPathologist components: - type: StorageFill contents: diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml index 9f200c6001e..9bfb87bb294 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers /lockers.yml @@ -45,12 +45,12 @@ - type: Appearance # Патолог. -#- type: entity -# parent: ADTClosetL3 -# id: ADTClosetLPathologist -# components: -# - type: Appearance -# - type: EntityStorageVisuals -# stateBaseClosed: bio_pathologist -# stateDoorOpen: bio_pathologist_open -# stateDoorClosed: bio_pathologist_door +- type: entity + parent: ADTClosetL3 + id: ADTClosetLPathologist + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: bio_pathologist + stateDoorOpen: bio_pathologist_open + stateDoorClosed: bio_pathologist_door From 04f653e536430e46221e8d937ad917de5e15c118 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:56:30 +0000 Subject: [PATCH 73/75] da --- Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index b7caccffce7..a4c37368749 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -6,4 +6,5 @@ - type: StorageFill contents: - id: ADTClothingOuterBioPathologist - - id: ADTClothingHeadHatHoodBioPathologist \ No newline at end of file + - id: ADTClothingHeadHatHoodBioPathologist + \ No newline at end of file From a140d5e3f939fd0419378fb3a6641709303fdaca Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:35:35 +0000 Subject: [PATCH 74/75] =?UTF-8?q?Revert=20"=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D0=BC=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=88=D0=BA=D0=B0=D1=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a8d81754a0f76ed3d67e867c1c5826650dbb6535. --- .../ADT/Catalog/Fills/Lockers/biohazard.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml index a4c37368749..9d2acca0038 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/biohazard.yml @@ -1,10 +1,10 @@ -- type: entity - id: ADTClosetLPathologistFilled - suffix: Filled, Pathologist - parent: ADTClosetLPathologist - components: - - type: StorageFill - contents: - - id: ADTClothingOuterBioPathologist - - id: ADTClothingHeadHatHoodBioPathologist - \ No newline at end of file + #- type: entity + # parent: ADTClosetLPathologist + # id: ADTClosetLPathologistFilled + # suffix: Filled, Pathologist + # components: + # - type: StorageFill + # contents: + # - id: ADTClothingOuterBioPathologist + # - id: ADTClothingHeadHatHoodBioPathologist + From acab645480f5033ec7c7b61746419072cb1e95a6 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:42:53 +0000 Subject: [PATCH 75/75] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Structures/Storage/Closets/Lockers/fill.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/fill.txt diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/fill.txt b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file