fixMerge

ZoNeSRuS · ZoNeSRuS · commit 81569f9ee444 · 2024-03-28T20:41:25.000+07:00
diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml
@@ -20,6 +20,7 @@
     ChiefEngineer: [ male ]
     Quartermaster: [ male ]
     ChiefMedicalOfficer: [ male ]
+    ResearchDirector: [ male ]
 #ЦК
     IAA: [ ]
     BlueShield: [ male ]
@@ -34,7 +35,7 @@
     StationEngineer: [ female ]
     TechnicalAssistant: [ female ]
 #Медицинский отдел
-    Psychologist: [ female ]
+    Psychologist: [ ]
     Chemist: [ female ]
     MedicalDoctor: [ female ]
     MedicalIntern: [ female ]
diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml
@@ -14,7 +14,7 @@
   femaleLastNames: DionaLast # Corvax-LastnameGender
   naming: TheFirstofLast
   buttScanTexture: /Textures/SS220/Interface/Butts/diona.png
-  blockedJobs: #SS220-Job-Restrictions-start
+  blockedJobsByAccessor: #SS220-Job-Restrictions-start
 #Командование
     Captain: [ ]
     HeadOfSecurity: [ ]
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
@@ -7,7 +7,7 @@
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned
-  blockedJobs: #SS220-Job-Restrictions-start
+  blockedJobsByAccessor: #SS220-Job-Restrictions-start
 #Командование
     Captain: [ ]
     HeadOfPersonnel: [ ]
diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml
@@ -12,7 +12,7 @@
   femaleFirstNames: names_moth_first_female
   maleLastNames: names_moth_last_male
   femaleLastNames: names_moth_last_female
-  blockedJobs: #SS220-Job-Restrictions-start
+  blockedJobsByAccessor: #SS220-Job-Restrictions-start
 #Командование
     Captain: [ ]
     HeadOfSecurity: [ ]
diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
@@ -12,7 +12,7 @@
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
   buttScanTexture: /Textures/SS220/Interface/Butts/unathi.png
-  blockedJobs: #SS220-Job-Restrictions-start
+  blockedJobsByAccessor: #SS220-Job-Restrictions-start
 #Командование
     Captain: [ ]
 #ЦК
diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
@@ -9,7 +9,7 @@
   dollPrototype: MobSlimePersonDummy
   skinColoration: Hues
   buttScanTexture: /Textures/SS220/Interface/Butts/slime.png
-  blockedJobs: #SS220-Job-Restrictions-start
+  blockedJobsByAccessor: #SS220-Job-Restrictions-start
 #Командование
     Captain: [ ]
 #ЦК
