Surgery fixes (#221)

* Fix medborg surgery and give them targeting * fix medical jobs not being fast at surgery
space-syndicate · Jan 4, 2025 · 68aee7a · 68aee7a
1 parent b00335e
commit 68aee7a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -165,6 +165,8 @@
   - type: ShowHealthIcons
     damageContainers:
     - Biological
+  - type: SurgeryTarget # Corvax-Next-Surgery
+  - type: Sanitized # Corvax-Next-Surgery
 
   # Visual
   inventoryTemplateId: borgDutch