From b54383e006de70be24db43c2487bc2eabbabcc6c Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 30 May 2024 19:07:44 +0300 Subject: [PATCH 01/13] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BC?= =?UTF-8?q?=D1=89=20=D1=83=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=B8=20=D0=B0=D1=82=D0=BC=D0=BE=D1=81=D0=B0,=20?= =?UTF-8?q?=D0=BA=D0=BC=20=D0=B8=20=D0=9D=D0=A0=20=D0=BD=D0=B5=20=D0=B1?= =?UTF-8?q?=D1=83=D0=B4=D1=83=D1=82=20=D0=B0=D0=BD=D1=82=D0=B0=D0=B3=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8.=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D0=B4=20?= =?UTF-8?q?=D0=B8=20=D0=B0=D1=82=D0=BC=D0=BE=D1=81=20=D0=B1=D1=83=D0=B4?= =?UTF-8?q?=D1=83=D1=82=20=D0=B0=D0=BD=D1=82=D0=B0=D0=B3=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Roles/Jobs/Engineering/atmospheric_technician.yml | 5 +---- Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml | 5 +---- .../Prototypes/Roles/Jobs/Science/research_director.yml | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c4922cefe7e..323385ecfc8 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -19,7 +19,7 @@ startingGear: QuartermasterGear icon: "JobIconQuarterMaster" supervisors: job-supervisors-captain - canBeAntag: true + canBeAntag: false access: - Cargo - Salvage diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index d3f37969df4..077f3b492f0 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -10,15 +10,12 @@ startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce - canBeAntag: false + canBeAntag: true access: - Maintenance - Engineering - External - Atmospherics - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - type: startingGear id: AtmosphericTechnicianGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 504b1bd01c9..562c512c93c 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -12,16 +12,13 @@ startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo - canBeAntag: false + canBeAntag: true access: - Medical - Maintenance - External extendedAccess: - Chemistry - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - type: startingGear id: ParamedicGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b8023b01caa..e09b3e55542 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -14,7 +14,7 @@ icon: "JobIconResearchDirector" requireAdminNotify: true supervisors: job-supervisors-captain - canBeAntag: true + canBeAntag: false access: - Research - Command From a44ed5a41054eb912f7ab5397e40d3fc8045ee62 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 30 May 2024 19:16:30 +0300 Subject: [PATCH 02/13] =?UTF-8?q?=D1=87=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 43 +++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 3fc997ed4c9..8ab5d05186a 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1791,4 +1791,45 @@ Entries: - { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak} id: 55750 #костыль отображения в Обновлениях time: '2024-04-16T01:40:00.0000000+00:00' - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- author: Мудрый Дуб + changes: + - { message: "Парамедик с Атмосом могут стать агентами", type: Tweak} + - { message: "КМ и НР теперь не могут стать антагами", type: Tweak} + id: 55756 #костыль отображения в Обновлениях + time: '2024-05-30T19:14:00.0000000+00:00' \ No newline at end of file From 61c6cc5f1917f6d387835de8ec63394e857109b5 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Thu, 30 May 2024 19:21:27 +0300 Subject: [PATCH 03/13] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 66538b72d7a..b8e5a5170e6 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1831,5 +1831,5 @@ Entries: changes: - { message: "Парамедик с Атмосом могут стать агентами", type: Tweak} - { message: "КМ и НР теперь не могут стать антагами", type: Tweak} - id: 55756 #костыль отображения в Обновлениях - time: '2024-05-30T19:14:00.0000000+00:00' \ No newline at end of file + id: 55757 #костыль отображения в Обновлениях + time: '2024-05-30T19:14:00.0000000+00:00' From 1abede1aef90227c07bf8271e41104026aa2c400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Thu, 30 May 2024 23:20:23 +0300 Subject: [PATCH 04/13] =?UTF-8?q?=D0=90=D1=82=D0=BC=D0=BE=D1=81=20=D1=81?= =?UTF-8?q?=20=D0=9C=D0=A8=20=D0=B8=20=D0=B1=D0=B5=D0=B7=20=D0=B0=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D0=B6=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roles/Jobs/Engineering/atmospheric_technician.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 077f3b492f0..baa970c154d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -10,13 +10,15 @@ startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce - canBeAntag: true + canBeAntag: false access: - Maintenance - Engineering - External - Atmospherics - + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: AtmosphericTechnicianGear equipment: From c63e370b980b4dcfac1f9534d2f3b20c09a76b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Thu, 30 May 2024 23:24:43 +0300 Subject: [PATCH 05/13] =?UTF-8?q?#-=20id:=20JawsOfLife=20#=20=D0=9F=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D0=B4=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D1=8C=20=D0=B1=D0=B5=D0=B7=20=D0=9C=D0=A9=20=D0=B8=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B1=D1=8B=D1=82=D1=8C=20=D0=B0?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=B3=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 94e942b4762..fd2bf3a8629 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -51,7 +51,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: JawsOfLife + #- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом - id: SpaceCash500 - type: entity From 3353571034170be9f1367c119a289a0e138a3bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Thu, 30 May 2024 23:25:54 +0300 Subject: [PATCH 06/13] Update duffelbag.yml --- .../ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index b8bdfd818da..70a105465ec 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: JawsOfLife + #- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом - id: SpaceCash500 - type: entity @@ -142,4 +142,4 @@ - id: RubberStampTrader - id: AppraisalTool - id: SpaceCash500 - - id: ADTClothingOuterCoatTrader \ No newline at end of file + - id: ADTClothingOuterCoatTrader From d4d00dc4adb9b99a6c1e413fcc4b612af4ad52d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Thu, 30 May 2024 23:32:04 +0300 Subject: [PATCH 07/13] Update satchel.yml --- .../ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index f67304cc256..0be347b206f 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: JawsOfLife + #- id: JawsOfLife # парамед без мщ и может быть антагом - id: SpaceCash500 - type: entity @@ -101,4 +101,4 @@ - id: OxygenTankFilled - id: RCD - id: RCDAmmo - amount: 6 \ No newline at end of file + amount: 6 From 95ed12d4f3a078c0fb62449b32ede3aac0ac5964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Thu, 30 May 2024 23:38:00 +0300 Subject: [PATCH 08/13] Update atmospheric_technician.yml --- .../Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index baa970c154d..d3f37969df4 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -19,6 +19,7 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] + - type: startingGear id: AtmosphericTechnicianGear equipment: From c17a08075336dfa2cbf1907fb29960af9d0ecc47 Mon Sep 17 00:00:00 2001 From: Ed <145219878+eddiedoesGIT@users.noreply.github.com> Date: Fri, 31 May 2024 17:04:45 +0300 Subject: [PATCH 09/13] Changelog correction --- Resources/Changelog/ChangelogADT.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index b8e5a5170e6..394bc687261 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1829,7 +1829,6 @@ Entries: - author: Мудрый Дуб changes: - - { message: "Парамедик с Атмосом могут стать агентами", type: Tweak} - - { message: "КМ и НР теперь не могут стать антагами", type: Tweak} + - { message: "Все главы имеют вживленный чип MindShield и не могут стать антагами", type: Tweak} id: 55757 #костыль отображения в Обновлениях time: '2024-05-30T19:14:00.0000000+00:00' From 8902292c22d5766c17058aaff66e9222bca22518 Mon Sep 17 00:00:00 2001 From: Ed <145219878+eddiedoesGIT@users.noreply.github.com> Date: Fri, 31 May 2024 17:05:31 +0300 Subject: [PATCH 10/13] Update backpack - paramedic --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index fd2bf3a8629..94e942b4762 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -51,7 +51,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - #- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом + - id: JawsOfLife - id: SpaceCash500 - type: entity From 93075ec52c072aebbb616f01c8acc73cf24a6221 Mon Sep 17 00:00:00 2001 From: Ed <145219878+eddiedoesGIT@users.noreply.github.com> Date: Fri, 31 May 2024 17:06:06 +0300 Subject: [PATCH 11/13] Update duffelbag - paramedic.yml --- .../ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 70a105465ec..a2945d69bb4 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - #- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом + - id: JawsOfLife # Парамед теперь без МЩ и может быть антагом - id: SpaceCash500 - type: entity From 0e4b1e91466218af29703dce65bf2676b3af3052 Mon Sep 17 00:00:00 2001 From: Ed <145219878+eddiedoesGIT@users.noreply.github.com> Date: Fri, 31 May 2024 17:08:30 +0300 Subject: [PATCH 12/13] Update paramedic - mindshield and noantag.yml --- Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 562c512c93c..504b1bd01c9 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -12,13 +12,16 @@ startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo - canBeAntag: true + canBeAntag: false access: - Medical - Maintenance - External extendedAccess: - Chemistry + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] - type: startingGear id: ParamedicGear From 752fbb1f54cbe47057bb9b8b5bdfa0a736944208 Mon Sep 17 00:00:00 2001 From: Ed <145219878+eddiedoesGIT@users.noreply.github.com> Date: Fri, 31 May 2024 17:09:54 +0300 Subject: [PATCH 13/13] Update satchel - paramed-jaws.yml --- .../ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 0be347b206f..f3604d15244 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - #- id: JawsOfLife # парамед без мщ и может быть антагом + - id: JawsOfLife - id: SpaceCash500 - type: entity