Spawnroles

Resources/Locale/en-US/_corvaxnext/job/job-description.ftl

@@ -0,0 +1 @@
+job-description-surgeon = Masterfully shove the scalpel deep into the poor souls who come... Saving lives, of course!

Resources/Locale/en-US/_corvaxnext/job/job-names.ftl

@@ -0,0 +1 @@
+job-name-surgeon = surgeon

Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl

@@ -0,0 +1 @@
+job-description-surgeon = Мастерски пихайте скальпель куда поглубже приходящим бедолагам... Спасая жизни, конечно!

Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl

@@ -0,0 +1,2 @@
+job-name-surgeon = хирург
+JobSurgeon = хирург

Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl

@@ -3,3 +3,8 @@ loadout-group-brigmedic-head = Бригмедик, голова
 loadout-group-brigmedic-jumpsuit = Бригмедик, комбинезон
 loadout-group-brigmedic-backpack = Бригмедик, верхняя одежда
 loadout-group-brigmedic-outerclothing = Бригмедик, рюкзак
+
+# Medical
+loadout-group-surgeon-head = Хирург, голова
+loadout-group-surgeon-jumpsuit = Хирург, комбинезон
+loadout-group-surgeon-scalpel = Хирург, скальпель

Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/belt/belts.ftl

@@ -2,3 +2,8 @@ ent-ClothingBeltWhiteSheath = белые сабельные ножны
    .desc = Стиль, блеск, всё для лучших сабель во вселенной.
 ent-ClothingBeltSheriffSheath = сабельные ножны шерифа
    .desc = Практичность, прочность, сабля точно не окажется в вашей ноге.
+ent-ClothingBeltSurgicalBoard = магнитная доска хирурга
+   .desc = Может магнитить хирургические инструменты, изготовленные на Медицинском ТехФабе. Помощник хирурга? У меня есть свой дружок!
+ent-ClothingBeltSurgicalBoardFilled = { ent-ClothingBeltSurgicalBoard }
+   .desc = { ent-ClothingBeltSurgicalBoard.desc }
+   .suffix = Заполненный

Resources/Prototypes/Corvax/Maps/astra.yml

@@ -36,6 +36,7 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 2, 2 ]
+          Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
           # science
           ResearchDirector: [ 1, 1 ]
           Scientist: [ 5, 6 ]

Resources/Prototypes/Corvax/Maps/avrite.yml

@@ -36,6 +36,7 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 3, 3 ]
+          Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
           # science
           ResearchDirector: [ 1, 1 ]
           Scientist: [ 5, 6 ]
@@ -47,6 +48,7 @@
           SecurityCadet: [ 3, 4 ]
           Detective: [ 1, 1 ]
           Pilot: [ 1, 1 ]
+          Brigmedic: [ 1, 1 ] # Corvax-Next-Brigmedic
           # service
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 2, 2 ]

Resources/Prototypes/Corvax/Maps/awesome.yml

@@ -1,7 +1,7 @@
 - type: gameMap
   id: CorvaxAwesome
   mapName: 'Awesome Station'
-  mapPath: /Maps/corvax_awesome.yml 
+  mapPath: /Maps/corvax_awesome.yml
   minPlayers: 20
   maxPlayers: 50
   stations:
@@ -14,7 +14,7 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'TBK'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_awesome.yml 
+          emergencyShuttlePath: /Maps/Shuttles/emergency_awesome.yml
         - type: StationJobs
           availableJobs:
             # command
@@ -36,6 +36,7 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
+            Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]

Resources/Prototypes/Corvax/Maps/delta.yml

@@ -37,6 +37,7 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
+            Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 6, 6 ]

Resources/Prototypes/Corvax/Maps/maus.yml

@@ -38,6 +38,7 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [1, 1]
             Chemist: [ 2, 2 ]
+            Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]

Resources/Prototypes/Corvax/Maps/paper.yml

@@ -40,6 +40,7 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 2, 2 ]
+          Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
           # science
           Scientist: [ 4, 4 ]
           ResearchAssistant: [ 3, 3 ]
@@ -48,6 +49,7 @@
           SecurityOfficer: [ 3, 4 ]
           SecurityCadet: [ 3, 3 ]
           Detective: [ 1, 1 ]
+          Brigmedic: [ 1, 1 ] # Corvax-Next-Brigmedic
           # service
           Bartender: [ 2, 2 ]
           Botanist: [ 3, 3 ]

Resources/Prototypes/Corvax/Maps/pilgrim.yml

@@ -37,6 +37,7 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
+            Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]

Resources/Prototypes/Corvax/Maps/tushkan.yml

@@ -38,6 +38,7 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 1, 1 ]
+            Surgeon: [ 1, 1 ] # Corvax-Next-Surgeon
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 2, 2 ]

Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml

@@ -42,6 +42,10 @@
     endSound:
       path: /Audio/Medical/Surgery/cautery2.ogg
   - type: Cautery
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - Cautery
   # end-_CorvaxNext: surgery
 
 # Drill
@@ -73,6 +77,10 @@
     startSound:
       path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
   - type: Drill
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - Drill
   # end-_CorvaxNext: surgery
 
 # Scalpel
@@ -114,6 +122,10 @@
     endSound:
       path: /Audio/Medical/Surgery/scalpel2.ogg
   - type: Scalpel
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - Scalpel
   # end-_CorvaxNext: surgery
 
 
@@ -164,8 +176,14 @@
     sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     storedRotation: 90
     heldPrefix: laser
-  - type: Scalpel # _CorvaxNext
+  # start-_CorvaxNext: surgery
+  - type: Scalpel
     speed: 1.5
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - ScalpelLaser
+  # end-_CorvaxNext: surgery
   # TODO: prevent bleeding from incisions
 
 # Retractor
@@ -189,6 +207,10 @@
     endSound:
       path: /Audio/Medical/Surgery/retractor2.ogg
   - type: Retractor
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - Retractor
   # end-_CorvaxNext: surgery
 
 # Hemostat
@@ -215,6 +237,10 @@
   - type: Hemostat
   - type: Tweezers
   - type: Tending
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - Hemostat
   # end-_CorvaxNext: surgery
 
 # Bone setter
@@ -331,6 +357,10 @@
     speedModifier: 1.5
   - type: BoneSaw
     speed: 1.5
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - SawElectric
   # end-_CorvaxNext: surgery
 
 - type: entity
@@ -389,6 +419,10 @@
     speed: 1.5
   - type: Drill
     speed: 1.5
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - EnergyCautery
 
 - type: entity
   name: energy scalpel
@@ -420,6 +454,10 @@
     speed: 1.5
   - type: BoneSaw
     speed: 1.5
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - EnergyScalpel
 
 - type: entity
   name: mechanical pinches
@@ -455,6 +493,10 @@
     speed: 1.5
   - type: Tending
     speed: 1.5
+  - type: Tag
+    tags:
+    - SurgeryTool
+    - AdvancedRetractor
 
 - type: entity
   name: medical multitool

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -100,6 +100,7 @@
   - MedicalIntern
   - Psychologist
   - Paramedic
+  - Surgeon # Corvax-Next-Surgeon
 
 - type: department
   id: Security

Resources/Prototypes/_CorvaxNext/Entities/Clothing/Belt/belts.yml

@@ -21,3 +21,85 @@
     state: sheath
   - type: Clothing
     sprite: _CorvaxNext/Clothing/Belt/sheriff_sheath.rsi
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltSurgicalBoard
+  name: surgical magnetic board
+  description: Able to magnetize special surgical instruments made on Medical TechFab. Surgeon's assistant? I have my own little buddy!
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Clothing/Belt/surgical_board.rsi
+  - type: Clothing
+    sprite: _CorvaxNext/Clothing/Belt/surgical_board.rsi
+  - type: Storage
+    whitelist:
+      tags:
+        - Hemostat
+        - Scalpel
+        - EnergyScalpel
+        - ScalpelLaser
+        - Retractor
+        - AdvancedRetractor
+        - Cautery
+        - EnergyCautery
+        - Drill
+        - SawElectric
+  - type: ItemMapper
+    mapLayers:
+      hemostat:
+        whitelist:
+          tags:
+          - Hemostat
+      scalpel:
+        whitelist:
+          tags:
+          - Scalpel
+      energyScalpel:
+        whitelist:
+          tags:
+          - EnergyScalpel
+      scalpelLaser:
+        whitelist:
+          tags:
+          - ScalpelLaser
+      retractor:
+        whitelist:
+          tags:
+          - Retractor
+      advancedRetractor:
+        whitelist:
+          tags:
+          - AdvancedRetractor
+      cautery:
+        whitelist:
+          tags:
+          - Cautery
+      energyCautery:
+        whitelist:
+          tags:
+            - EnergyCautery
+      drill:
+        whitelist:
+          tags:
+            - Drill
+      sawElectric:
+        whitelist:
+          tags:
+            - SawElectric
+    sprite: _CorvaxNext/Clothing/Belt/belt_overlay.rsi
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltSurgicalBoard
+  id: ClothingBeltSurgicalBoardFilled
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: Hemostat
+      - id: Scalpel
+      - id: Retractor
+      - id: Cautery
+      - id: Drill
+      - id: SawElectric

Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Medical/surgeon.yml

@@ -0,0 +1,17 @@
+- type: loadoutEffectGroup
+  id: SeniorSurgeon
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSurgeon
+      time: 187200 # 52 hrs
+
+- type: loadout
+  id: SurgeonScalpelLaser
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorSurgeon
+  storage:
+    back:
+    - ScalpelLaser

Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml

@@ -30,3 +30,27 @@
   - BrigmedicOuterClothingCoat
   - BrigmedicOuterClothingLab
   - BrigmedicOuterClothingVest
+
+# Medical
+- type: loadoutGroup
+  id: SurgeonHead
+  name: loadout-group-surgeon-head
+  loadouts:
+  - BlueSurgeryCap
+  - GreenSurgeryCap
+  - PurpleSurgeryCap
+
+- type: loadoutGroup
+  id: SurgeonJumpsuit
+  name: loadout-group-surgeon-jumpsuit
+  loadouts:
+  - MedicalBlueScrubs
+  - MedicalGreenScrubs
+  - MedicalPurpleScrubs
+
+- type: loadoutGroup
+  id: SurgeonScalpel
+  name: loadout-group-surgeon-scalpel
+  minLimit: 0
+  loadouts:
+  - SurgeonScalpelLaser

Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml

@@ -9,3 +9,15 @@
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
+
+- type: roleLoadout
+  id: JobSurgeon
+  groups:
+  - Inventory # Corvax-Loadouts
+  - SurgeonHead
+  - SurgeonJumpsuit
+  - MedicalBackpack
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+  - SurgeonScalpel