Department fixes

Resources/Locale/ru-RU/TS/job-misc.ftl

@@ -24,4 +24,8 @@ JobPlatoonCommander = Командир взвода
 
 # Supervisors
 job-supervisors-platoon = Командиру взвода и Командиру отделения
-job-supervisors-part-pc = Командиру взвода
+job-supervisors-part-pc = Командиру взвода
+
+# Departments
+department-Combat = Военный гарнизон
+department-combat-description = Сотрудники военное гарнизона выполняют разведовательные миссии за пределами станции, в других секторах. Не самые сильные во вселенной, но стрелять умеют.

Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml

@@ -57,6 +57,7 @@
   - type: Weldable
     time: 10
   - type: Airlock
+    openUnlitVisible: true # Corvax-Resprite-Airlocks
   - type: NavMapDoor
   - type: DoorBolt
   - type: AccessReader

Resources/Prototypes/Maps/deterrent.yml

@@ -2,8 +2,9 @@
   id: Deterrent
   mapName: 'Deterrent'
   mapPath: /Maps/deterrent.yml
-  minPlayers: 15
+  minPlayers: 0
   maxPlayers: 55
+  fallback: true
   stations:
     Deterrent:
       stationProto: StandardNanotrasenStation
@@ -19,5 +20,41 @@
           overflowJobs:
             - Passenger
           availableJobs:
+# service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 1, 1 ]
+            Botanist: [ 2, 2 ]
+            Chef: [ 1, 1 ]
+            Janitor: [ 1, 1 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 1, 1 ]
+# combat
+            PlatoonCommander: [ 1, 1 ]
+            PartCommander: [ 3, 3 ]
+            Marine: [ 9, 9 ]
+            MarineMedic: [ 3, 3 ]
+            MarineEngineer: [ 3, 3 ]
+            MarinePilot: [ 2, 2 ]
+# engineering
+            ChiefEngineer: [ 1, 1 ]
+            StationEngineer: [ 3, 3 ]
+# medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            MedicalDoctor: [ 3, 3 ]
+            MedicalIntern: [ 1, 3 ]
+# science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 2, 2 ]
+            ResearchAssistant: [ 1, 3 ]
+            Borg: [ 4, 4 ]
+# security
+            HeadOfSecurity: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
+# supply
+            Quartermaster: [ 1, 1 ]
+            CargoTechnician: [ 2, 2 ]
+# civillian
             Passenger: [ -1, -1 ]
 

Resources/Prototypes/TS/Entities/Objects/MissionItems/paper.yml

@@ -16,7 +16,7 @@
 
 
 - type: entity
-  id: BoxFolderGreyMission1
+  id: BoxFolderGreyMission
   parent: BoxFolderGrey
   suffix: mission
   components:

Resources/Prototypes/TS/Roles/Combat/marine.yml

@@ -3,9 +3,9 @@
   name: job-name-marine
   description: job-description-marine
   playTimeTracker: JobMarine
-  requirements:
-  - !type:OverallPlaytimeRequirement
-    time: 7200 #2 hrs
+#  requirements:        # First Playtest time
+#  - !type:OverallPlaytimeRequirement
+#    time: 7200 #2 hrs
   startingGear: MarineBaseGear
   icon: "JobIconMarine"
   supervisors: job-supervisors-part-pc

Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml

@@ -3,13 +3,13 @@
   name: job-name-marine-engineer
   description: job-description-marine-engineer
   playTimeTracker: JobMarineEngineer
-  requirements:
-  - !type:DepartmentTimeRequirement
-    department: Combat
-    time: 7200 #2 hrs
-  - !type:DepartmentTimeRequirement
-    department: Engineering
-    time: 7200 #2 hrs
+#  requirements:        # First Playtest time
+#  - !type:DepartmentTimeRequirement
+#    department: Combat
+#    time: 7200 #2 hrs
+#  - !type:DepartmentTimeRequirement
+#    department: Engineering
+#    time: 7200 #2 hrs
   startingGear: MarineEngineerGear
   icon: "JobIconMarineEngineer"
   supervisors: job-supervisors-part-pc

Resources/Prototypes/TS/Roles/Combat/marine_medic.yml

@@ -3,13 +3,13 @@
   name: job-name-marine-medic
   description: job-description-marine-medic
   playTimeTracker: JobMarineMedic
-  requirements:
-  - !type:DepartmentTimeRequirement
-    department: Combat
-    time: 7200 #2 hrs
-  - !type:DepartmentTimeRequirement
-    department: Medical
-    time: 7200 #2 hrs
+#  requirements:        # First Playtest time
+#  - !type:DepartmentTimeRequirement
+#    department: Combat
+#    time: 7200 #2 hrs
+#  - !type:DepartmentTimeRequirement
+#    department: Medical
+#    time: 7200 #2 hrs
   startingGear: MarineMedicGear
   icon: "JobIconJobMarineMedic"
   supervisors: job-supervisors-part-pc

Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml

@@ -3,13 +3,13 @@
   name: job-name-marine-pilot
   description: job-description-marine-pilot
   playTimeTracker: JobMarinePilot
-  requirements:
-  - !type:DepartmentTimeRequirement
-    department: Combat
-    time: 7200 #2 hrs
-  - !type:DepartmentTimeRequirement
-    department: Engineering
-    time: 7200 #2 hrs
+#  requirements:            # First Playtest time
+#  - !type:DepartmentTimeRequirement
+#    department: Combat
+#    time: 7200 #2 hrs
+#  - !type:DepartmentTimeRequirement
+#    department: Engineering
+#    time: 7200 #2 hrs
   startingGear: MarinePilotGear
   icon: "JobIconMarinePilot"
   supervisors: job-supervisors-platoon

Resources/Prototypes/TS/Roles/Combat/part_commander.yml

@@ -4,9 +4,12 @@
   description: job-description-part-commander
   playTimeTracker: JobPartCommander
   requirements:
-  - !type:DepartmentTimeRequirement
+#  - !type:DepartmentTimeRequirement
+#    department: Combat
+#    time: 36000 #10 hrs            
+  - !type:DepartmentTimeRequirement     # First Playtest time
     department: Combat
-    time: 36000 #10 hrs
+    time: 1800 #30 min 
   startingGear: PartCommanderGear
   icon: "JobIconPartCommander"
   supervisors: job-supervisors-platoon

Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml

@@ -3,16 +3,19 @@
   name: job-name-platoon-commander
   description: job-description-platoon-commander
   playTimeTracker: JobPlatoonCommander
-  requirements:
+  requirements:            # First Playtest time
   - !type:DepartmentTimeRequirement
     department: Combat
-    time: 72000 #20 hrs
-  - !type:DepartmentTimeRequirement
-    department: Medical
-    time: 7200 #2 hrs
-  - !type:DepartmentTimeRequirement
-    department: Engineering
-    time: 7200 #2 hrs
+    time: 7200 #2 hrs       
+#  - !type:DepartmentTimeRequirement
+#    department: Combat
+#    time: 72000 #20 hrs
+#  - !type:DepartmentTimeRequirement
+#    department: Medical
+#    time: 7200 #2 hrs
+#  - !type:DepartmentTimeRequirement
+#    department: Engineering
+#    time: 7200 #2 hrs
   startingGear: PlatoonCommanderGear
   icon: "JobIconPlatoonCommander"
   supervisors: job-supervisors-captain

Resources/Prototypes/TS/Roles/CombatMisc.yml

@@ -4,12 +4,13 @@
   description: department-combat-description
   color: "#C3C3BD"
   roles:
+  - PlatoonCommander
+  - PartCommander
   - Marine
   - MarineMedic
   - MarineEngineer
   - MarinePilot
-  - PartCommander
-  - PlatoonCommander
+
 
 
 # Jobs