From 68aee7a103cae04d60673aa7bcb0e6d99c655867 Mon Sep 17 00:00:00 2001
From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Date: Sat, 4 Jan 2025 06:33:18 +0300
Subject: [PATCH] Surgery fixes (#221)

* Fix medborg surgery and give them targeting

* fix medical jobs not being fast at surgery
---
 .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml   | 1 +
 Resources/Prototypes/Roles/Jobs/Medical/chemist.yml          | 2 +-
 .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml  | 2 +-
 Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml   | 2 +-
 Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml   | 2 +-
 Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml        | 2 +-
 .../Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml    | 5 +++++
 .../Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml | 4 ++++
 Resources/Prototypes/borg_types.yml                          | 2 ++
 9 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index d01a30b3c56..27d03985b9c 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -247,6 +247,7 @@
         Heat: 10 # capable of touching light bulbs and stoves without feeling pain!
   - type: TTS # Corvax-TTS
     voice: TrainingRobot
+  - type: Targeting # Corvax-Next-Surgery
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 50901af3763..f39813d7ba7 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -20,7 +20,7 @@
     components:
     #- type: CPRTraining
     - type: SurgerySpeedModifier
-      SpeedModifier: 1.75
+      speedModifier: 1.75
     #end-_CorvaxNext: surgery
 
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 455e1a149c2..79155ec2c50 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -39,7 +39,7 @@
     #start-_CorvaxNext: surgery
     #- type: CPRTraining
     - type: SurgerySpeedModifier
-      SpeedModifier: 2.5
+      speedModifier: 2.5
     #end-_CorvaxNext: surgery
 
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 13ffa053658..abe099530f4 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -21,7 +21,7 @@
     #start-_CorvaxNext: surgery
     #- type: CPRTraining
     - type: SurgerySpeedModifier
-      SpeedModifier: 1.75
+      speedModifier: 1.75
     #end-_CorvaxNext: surgery
 
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index fee2e4e3202..994c2215926 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -21,7 +21,7 @@
     #start-_CorvaxNext: surgery
     #- type: CPRTraining
     - type: SurgerySpeedModifier
-      SpeedModifier: 1.5
+      speedModifier: 1.5
     #end-_CorvaxNext: surgery
 
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 79c50097dd9..ec373dc43aa 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -23,7 +23,7 @@
     #start-_CorvaxNext: surgery
     #- type: CPRTraining
     - type: SurgerySpeedModifier
-      SpeedModifier: 1.75
+      speedModifier: 1.75
     #end-_CorvaxNext: surgery
 
 - type: startingGear
diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml
index a9c561a0d66..82758531951 100644
--- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml
+++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml
@@ -15,6 +15,11 @@
   - Maintenance
   extendedAccess:
   - Chemistry
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: SurgerySpeedModifier
+      speedModifier: 2.5
 
 - type: startingGear
   id: SurgeonGear
diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml
index 9fb092102d2..50dc6ffff37 100644
--- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml
@@ -25,6 +25,10 @@
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+    - type: SurgerySpeedModifier
+      speedModifier: 1.75
 
 - type: startingGear
   id: BrigmedicGear
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index f6294be68e3..0d906f9a1a8 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -165,6 +165,8 @@
   - type: ShowHealthIcons
     damageContainers:
     - Biological
+  - type: SurgeryTarget # Corvax-Next-Surgery
+  - type: Sanitized # Corvax-Next-Surgery
 
   # Visual
   inventoryTemplateId: borgDutch