diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
index a55d5dd08ac..2e3c02c9f6d 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
@@ -1,4 +1,2 @@
 ent-SpawnPointPilot = pilot
     .desc = { ent-SpawnPointJobBase.desc }
-ent-SpawnPointSurgeon = surgeon
-    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
index 67a91f0ac9f..1fe4b2d1fa4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
@@ -1,4 +1,2 @@
 ent-SpawnPointPilot = пилот
     .desc = { ent-SpawnPointJobBase.desc }
-ent-SpawnPointSurgeon = хирург
-    .desc = { ent-SpawnPointJobBase.desc }
diff --git a/Resources/Maps/Corvax/corvax_astra.yml b/Resources/Maps/Corvax/corvax_astra.yml
index c0b049766a6..56369769819 100644
--- a/Resources/Maps/Corvax/corvax_astra.yml
+++ b/Resources/Maps/Corvax/corvax_astra.yml
@@ -240109,13 +240109,6 @@ entities:
     - type: Transform
       pos: 48.5,-82.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 44144
-    components:
-    - type: Transform
-      pos: -52.5,-18.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 31865
diff --git a/Resources/Maps/Corvax/corvax_avrite.yml b/Resources/Maps/Corvax/corvax_avrite.yml
index 59124e10692..a93eadb08a7 100644
--- a/Resources/Maps/Corvax/corvax_avrite.yml
+++ b/Resources/Maps/Corvax/corvax_avrite.yml
@@ -357406,18 +357406,6 @@ entities:
     - type: Transform
       pos: 33.5,23.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 6331
-    components:
-    - type: Transform
-      pos: 1.5,-60.5
-      parent: 2
-  - uid: 7207
-    components:
-    - type: Transform
-      pos: 16.5,-57.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 23806
diff --git a/Resources/Maps/Corvax/corvax_awesome.yml b/Resources/Maps/Corvax/corvax_awesome.yml
index bcb5ac2e869..afb6c7b6efa 100644
--- a/Resources/Maps/Corvax/corvax_awesome.yml
+++ b/Resources/Maps/Corvax/corvax_awesome.yml
@@ -104513,18 +104513,6 @@ entities:
     - type: Transform
       pos: -25.5,-37.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 13471
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
-  - uid: 13472
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13473
diff --git a/Resources/Maps/Corvax/corvax_delta.yml b/Resources/Maps/Corvax/corvax_delta.yml
index 063c486977a..59656bee504 100644
--- a/Resources/Maps/Corvax/corvax_delta.yml
+++ b/Resources/Maps/Corvax/corvax_delta.yml
@@ -230299,18 +230299,6 @@ entities:
     - type: Transform
       pos: -78.5,-0.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14756
-    components:
-    - type: Transform
-      pos: 33.5,-50.5
-      parent: 2
-  - uid: 14757
-    components:
-    - type: Transform
-      pos: 33.5,-48.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 30046
diff --git a/Resources/Maps/Corvax/corvax_glacier.yml b/Resources/Maps/Corvax/corvax_glacier.yml
index 630e170a181..089d20a01f2 100644
--- a/Resources/Maps/Corvax/corvax_glacier.yml
+++ b/Resources/Maps/Corvax/corvax_glacier.yml
@@ -242978,28 +242978,6 @@ entities:
     - type: Transform
       pos: 2.5,-41.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 27254
-    components:
-    - type: Transform
-      pos: -21.5,44.5
-      parent: 2
-  - uid: 27255
-    components:
-    - type: Transform
-      pos: -25.5,45.5
-      parent: 2
-  - uid: 27256
-    components:
-    - type: Transform
-      pos: -15.5,47.5
-      parent: 2
-  - uid: 27257
-    components:
-    - type: Transform
-      pos: -16.5,43.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 27258
diff --git a/Resources/Maps/Corvax/corvax_maus.yml b/Resources/Maps/Corvax/corvax_maus.yml
index 1035e0e3b09..b43cae6ca22 100644
--- a/Resources/Maps/Corvax/corvax_maus.yml
+++ b/Resources/Maps/Corvax/corvax_maus.yml
@@ -113454,13 +113454,6 @@ entities:
     - type: Transform
       pos: -68.5,-16.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19727
-    components:
-    - type: Transform
-      pos: -64.5,-38.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 17300
diff --git a/Resources/Maps/Corvax/corvax_outpost.yml b/Resources/Maps/Corvax/corvax_outpost.yml
index 93a25228eec..f4d04f651b4 100644
--- a/Resources/Maps/Corvax/corvax_outpost.yml
+++ b/Resources/Maps/Corvax/corvax_outpost.yml
@@ -104959,18 +104959,7 @@ entities:
     - type: Transform
       pos: -23.5,20.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19716
-    components:
-    - type: Transform
-      pos: 21.5,-43.5
-      parent: 2
-  - uid: 19717
-    components:
-    - type: Transform
-      pos: -0.5,-37.5
-      parent: 2
+
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13775
diff --git a/Resources/Maps/Corvax/corvax_paper.yml b/Resources/Maps/Corvax/corvax_paper.yml
index 658cc5c2137..9e3a0dbe623 100644
--- a/Resources/Maps/Corvax/corvax_paper.yml
+++ b/Resources/Maps/Corvax/corvax_paper.yml
@@ -102764,13 +102764,6 @@ entities:
     - type: Transform
       pos: 43.5,60.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14989
-    components:
-    - type: Transform
-      pos: 48.5,-10.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 14990
diff --git a/Resources/Maps/Corvax/corvax_pearl.yml b/Resources/Maps/Corvax/corvax_pearl.yml
index 103573aae3e..4160afb5b43 100644
--- a/Resources/Maps/Corvax/corvax_pearl.yml
+++ b/Resources/Maps/Corvax/corvax_pearl.yml
@@ -135627,13 +135627,6 @@ entities:
     - type: Transform
       pos: 49.5,110.5
       parent: 1
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19326
-    components:
-    - type: Transform
-      pos: 118.5,40.5
-      parent: 1
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19347
diff --git a/Resources/Maps/Corvax/corvax_pilgrim.yml b/Resources/Maps/Corvax/corvax_pilgrim.yml
index 5944fd86adb..af6f34d90d4 100644
--- a/Resources/Maps/Corvax/corvax_pilgrim.yml
+++ b/Resources/Maps/Corvax/corvax_pilgrim.yml
@@ -205678,13 +205678,6 @@ entities:
     - type: Transform
       pos: -8.5,32.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 42900
-    components:
-    - type: Transform
-      pos: -57.5,-30.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19112
diff --git a/Resources/Maps/Corvax/corvax_tushkan.yml b/Resources/Maps/Corvax/corvax_tushkan.yml
index 4be84420cfa..c7b964237c1 100644
--- a/Resources/Maps/Corvax/corvax_tushkan.yml
+++ b/Resources/Maps/Corvax/corvax_tushkan.yml
@@ -70358,13 +70358,6 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 11099
-    components:
-    - type: Transform
-      pos: -19.5,-3.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 7117
diff --git a/Resources/Maps/Next/next_astra.yml b/Resources/Maps/Next/next_astra.yml
index 5f0d852dd60..029bf303f2c 100644
--- a/Resources/Maps/Next/next_astra.yml
+++ b/Resources/Maps/Next/next_astra.yml
@@ -240109,13 +240109,6 @@ entities:
     - type: Transform
       pos: 48.5,-82.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 44144
-    components:
-    - type: Transform
-      pos: -52.5,-18.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 31865
diff --git a/Resources/Maps/Next/next_avrite.yml b/Resources/Maps/Next/next_avrite.yml
index e7ed1151ae5..15382b98ca3 100644
--- a/Resources/Maps/Next/next_avrite.yml
+++ b/Resources/Maps/Next/next_avrite.yml
@@ -357178,18 +357178,6 @@ entities:
     - type: Transform
       pos: 33.5,23.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 6331
-    components:
-    - type: Transform
-      pos: 1.5,-60.5
-      parent: 2
-  - uid: 7207
-    components:
-    - type: Transform
-      pos: 16.5,-57.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 23806
diff --git a/Resources/Maps/Next/next_awesome.yml b/Resources/Maps/Next/next_awesome.yml
index fdb4d557e8e..86a6f154340 100644
--- a/Resources/Maps/Next/next_awesome.yml
+++ b/Resources/Maps/Next/next_awesome.yml
@@ -104480,18 +104480,6 @@ entities:
     - type: Transform
       pos: -25.5,-37.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 13471
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
-  - uid: 13472
-    components:
-    - type: Transform
-      pos: -20.5,8.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13473
diff --git a/Resources/Maps/Next/next_bagel.yml b/Resources/Maps/Next/next_bagel.yml
index df1e17673a5..30ae2290d37 100644
--- a/Resources/Maps/Next/next_bagel.yml
+++ b/Resources/Maps/Next/next_bagel.yml
@@ -131817,13 +131817,6 @@ entities:
     - type: Transform
       pos: -3.5,16.5
       parent: 60
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 10719
-    components:
-    - type: Transform
-      pos: 39.5,-13.5
-      parent: 60
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 4547
diff --git a/Resources/Maps/Next/next_delta.yml b/Resources/Maps/Next/next_delta.yml
index 972ea0b17c7..0581ebfb50e 100644
--- a/Resources/Maps/Next/next_delta.yml
+++ b/Resources/Maps/Next/next_delta.yml
@@ -230299,18 +230299,6 @@ entities:
     - type: Transform
       pos: -78.5,-0.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14756
-    components:
-    - type: Transform
-      pos: 33.5,-50.5
-      parent: 2
-  - uid: 14757
-    components:
-    - type: Transform
-      pos: 33.5,-48.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 30046
diff --git a/Resources/Maps/Next/next_glacier.yml b/Resources/Maps/Next/next_glacier.yml
index ede4c5ea13a..bd173b6fda7 100644
--- a/Resources/Maps/Next/next_glacier.yml
+++ b/Resources/Maps/Next/next_glacier.yml
@@ -246609,28 +246609,6 @@ entities:
     - type: Transform
       pos: 2.5,-41.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 27884
-    components:
-    - type: Transform
-      pos: -21.5,44.5
-      parent: 2
-  - uid: 27885
-    components:
-    - type: Transform
-      pos: -25.5,45.5
-      parent: 2
-  - uid: 27886
-    components:
-    - type: Transform
-      pos: -15.5,47.5
-      parent: 2
-  - uid: 27887
-    components:
-    - type: Transform
-      pos: -16.5,43.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 27888
diff --git a/Resources/Maps/Next/next_maus.yml b/Resources/Maps/Next/next_maus.yml
index 8d739f4384d..a0f127753e6 100644
--- a/Resources/Maps/Next/next_maus.yml
+++ b/Resources/Maps/Next/next_maus.yml
@@ -113430,25 +113430,6 @@ entities:
     - type: Transform
       pos: -68.5,-16.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19727
-    components:
-    - type: Transform
-      pos: -64.5,-38.5
-      parent: 2
-- proto: SpawnPointTechnicalAssistant
-  entities:
-  - uid: 17300
-    components:
-    - type: Transform
-      pos: -68.5,-19.5
-      parent: 2
-  - uid: 17301
-    components:
-    - type: Transform
-      pos: -68.5,-17.5
-      parent: 2
 - proto: SpawnPointWarden
   entities:
   - uid: 5997
diff --git a/Resources/Maps/Next/next_outpost.yml b/Resources/Maps/Next/next_outpost.yml
index 31b11685ebc..e5a45dfc782 100644
--- a/Resources/Maps/Next/next_outpost.yml
+++ b/Resources/Maps/Next/next_outpost.yml
@@ -95061,18 +95061,6 @@ entities:
     - type: Transform
       pos: -23.5,20.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19716
-    components:
-    - type: Transform
-      pos: 21.5,-43.5
-      parent: 2
-  - uid: 19717
-    components:
-    - type: Transform
-      pos: -0.5,-37.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 13775
diff --git a/Resources/Maps/Next/next_paper.yml b/Resources/Maps/Next/next_paper.yml
index a2424433270..29189bc455d 100644
--- a/Resources/Maps/Next/next_paper.yml
+++ b/Resources/Maps/Next/next_paper.yml
@@ -102764,13 +102764,6 @@ entities:
     - type: Transform
       pos: 43.5,60.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 14989
-    components:
-    - type: Transform
-      pos: 48.5,-10.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 14990
diff --git a/Resources/Maps/Next/next_pearl.yml b/Resources/Maps/Next/next_pearl.yml
index 640bbbd0fe9..40aea253093 100644
--- a/Resources/Maps/Next/next_pearl.yml
+++ b/Resources/Maps/Next/next_pearl.yml
@@ -134999,13 +134999,6 @@ entities:
     - type: Transform
       pos: 49.5,110.5
       parent: 1
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 19326
-    components:
-    - type: Transform
-      pos: 118.5,40.5
-      parent: 1
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19347
diff --git a/Resources/Maps/Next/next_pilgrim.yml b/Resources/Maps/Next/next_pilgrim.yml
index b934649646d..43ec383e06e 100644
--- a/Resources/Maps/Next/next_pilgrim.yml
+++ b/Resources/Maps/Next/next_pilgrim.yml
@@ -205674,13 +205674,6 @@ entities:
     - type: Transform
       pos: -8.5,32.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 42900
-    components:
-    - type: Transform
-      pos: -57.5,-30.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 19112
diff --git a/Resources/Maps/Next/next_tushkan.yml b/Resources/Maps/Next/next_tushkan.yml
index ef38bfd702f..a8d374d35ff 100644
--- a/Resources/Maps/Next/next_tushkan.yml
+++ b/Resources/Maps/Next/next_tushkan.yml
@@ -70358,13 +70358,6 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 2
-- proto: SpawnPointSurgeon
-  entities:
-  - uid: 11099
-    components:
-    - type: Transform
-      pos: -19.5,-3.5
-      parent: 2
 - proto: SpawnPointTechnicalAssistant
   entities:
   - uid: 7117
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 6b2b3f57d26..113c7189bb2 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -18,92 +18,111 @@
     price: 5
   - type: Tag
     tags:
-      - Trash
+    - Trash
   - type: PhysicalComposition
     materialComposition:
       Steel: 25
   - type: GuideHelp
     guides:
     - Cyborgs
-    - Robotics
+  - type: Gibbable
 
 - type: entity
-  id: BaseBorgArmLeft
+  id: LeftArmBorg
   parent: PartSilicon
   name: cyborg left arm
-  abstract: true
   components:
   - type: BodyPart
-    partType: Hand
     symmetry: Left
+  - type: Sprite
+    state: borg_l_arm
+  - type: Icon
+    state: borg_l_arm
   - type: Tag
     tags:
     - Trash
     - BorgArm
+    - BorgLArm
 
 - type: entity
-  id: BaseBorgArmRight
+  id: RightArmBorg
   parent: PartSilicon
   name: cyborg right arm
-  abstract: true
   components:
   - type: BodyPart
-    partType: Hand
     symmetry: Right
+  - type: Sprite
+    state: borg_r_arm
+  - type: Icon
+    state: borg_r_arm
   - type: Tag
     tags:
     - Trash
     - BorgArm
+    - BorgRArm
 
 - type: entity
-  id: BaseBorgLegLeft
+  id: LeftLegBorg
   parent: PartSilicon
   name: cyborg left leg
-  abstract: true
   components:
   - type: BodyPart
-    partType: Leg
     symmetry: Left
+  - type: Sprite
+    state: borg_l_leg
+  - type: Icon
+    state: borg_l_leg
   - type: Tag
     tags:
     - Trash
     - BorgLeg
+    - BorgLLeg
 
 - type: entity
-  id: BaseBorgLegRight
+  id: RightLegBorg
   parent: PartSilicon
   name: cyborg right leg
-  abstract: true
   components:
   - type: BodyPart
-    partType: Leg
     symmetry: Right
+  - type: Sprite
+    state: borg_r_leg
+  - type: Icon
+    state: borg_r_leg
   - type: Tag
     tags:
     - Trash
     - BorgLeg
+    - BorgRLeg
 
 - type: entity
-  id: BaseBorgHead
+  id: LightHeadBorg
   parent: PartSilicon
   name: cyborg head
-  abstract: true
   components:
   - type: BodyPart
     partType: Head
+  - type: Sprite
+    state: borg_head
+  - type: Icon
+    state: borg_head
   - type: Tag
     tags:
     - Trash
     - BorgHead
 
 - type: entity
-  id: BaseBorgTorso
+  id: TorsoBorg
   parent: PartSilicon
   name: cyborg torso
-  abstract: true
   components:
   - type: BodyPart
     partType: Torso
+  - type: Sprite
+    state: borg_chest
+  - type: Icon
+    state: borg_chest
   - type: Tag
     tags:
     - Trash
+    - BorgTorso
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
index e23d3c9de75..eda8f2ae8eb 100644
--- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
@@ -10,12 +10,3 @@
     - state: green
     - state: seniorofficer
 
-- type: entity
-  id: SpawnPointSurgeon
-  parent: SpawnPointJobBase
-  name: surgeon
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: virologist
diff --git a/Resources/Prototypes/Corvax/Maps/Next/astra.yml b/Resources/Prototypes/Corvax/Maps/Next/astra.yml
index d7ff295cc71..0619e46d80c 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/astra.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/astra.yml
@@ -37,7 +37,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 6 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/avrite.yml b/Resources/Prototypes/Corvax/Maps/Next/avrite.yml
index dca73fe475d..a7e88756cb2 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/avrite.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/avrite.yml
@@ -36,7 +36,6 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 3, 3 ]
-          Surgeon: [ 1, 1 ]
           # science
           ResearchDirector: [ 1, 1 ]
           Scientist: [ 5, 6 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/awesome.yml b/Resources/Prototypes/Corvax/Maps/Next/awesome.yml
index 2a0a114220c..a56da210a90 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/awesome.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/awesome.yml
@@ -36,7 +36,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/bagel.yml b/Resources/Prototypes/Corvax/Maps/Next/bagel.yml
index 130a47ea8d3..21574156d62 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/bagel.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/bagel.yml
@@ -34,7 +34,6 @@
             MedicalIntern: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/delta.yml b/Resources/Prototypes/Corvax/Maps/Next/delta.yml
index bc927b72d00..9a36a98ccc6 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/delta.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/delta.yml
@@ -37,7 +37,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 6, 6 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/maus.yml b/Resources/Prototypes/Corvax/Maps/Next/maus.yml
index 630eb979c27..ea8c39f3da5 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/maus.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/maus.yml
@@ -38,7 +38,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [1, 1]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/outpost.yml b/Resources/Prototypes/Corvax/Maps/Next/outpost.yml
index 205d17b3cf1..aad0acbeac3 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/outpost.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/outpost.yml
@@ -38,7 +38,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/paper.yml b/Resources/Prototypes/Corvax/Maps/Next/paper.yml
index a8902ae510c..cc88a24dd89 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/paper.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/paper.yml
@@ -40,7 +40,6 @@
           Psychologist: [ 1, 1 ]
           Paramedic: [ 1, 1 ]
           Chemist: [ 2, 2 ]
-          Surgeon: [ 1, 1 ]
           # science
           Scientist: [ 4, 4 ]
           ResearchAssistant: [ 3, 3 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml b/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml
index 87073845d43..d08d835d17c 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/pilgrim.yml
@@ -37,7 +37,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]
diff --git a/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml b/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml
index 2c27adc8df0..c63c16437b4 100644
--- a/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml
+++ b/Resources/Prototypes/Corvax/Maps/Next/tushkan.yml
@@ -38,7 +38,6 @@
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 1, 1 ]
-            Surgeon: [ 1, 1 ]
             # science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 2, 2 ]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 36aeac8d3c6..310166631ae 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -532,7 +532,7 @@
       - LiveLetLiveCircuitBoard
       - StationEfficiencyCircuitBoard
       - RobocopCircuitBoard
-      - DungeonMasterCircuitBoard
+      - GameMasterCircuitBoard
       - ArtistCircuitBoard
       - NutimovCircuitBoard
       # Corvax-Next-MutableLaws-End