meow!~ fixes

Author: AwareFoxy

Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl

@@ -0,0 +1,2 @@
+department-CentralCommandCorvax = Центральное Командование
+job-supervisors-centcom2 = руководству НТ

Resources/Maps/corvax_centcomm.yml

@@ -5800,6 +5800,8 @@ entities:
           - 0
           - 0
         chunkSize: 4
+    - type: BecomesStation
+      id: centcommcorvax
   - uid: 5
     components:
     - type: MetaData
@@ -8424,25 +8426,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,32.5
       parent: 2
-- proto: BaseAdvancedPen
-  entities:
-  - uid: 394
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 74.00797,12.565628
-      parent: 2
-  - uid: 395
-    components:
-    - type: Transform
-      pos: 57.72277,46.028847
-      parent: 2
-  - uid: 396
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 37.62642,48.595196
-      parent: 2
 - proto: BaseComputer
   entities:
   - uid: 397
@@ -40251,13 +40234,6 @@ entities:
     - type: Transform
       pos: 62.5473,33.443535
       parent: 2
-- proto: MaterialReclaimer
-  entities:
-  - uid: 4942
-    components:
-    - type: Transform
-      pos: 37.5,56.5
-      parent: 2
 - proto: Mattress
   entities:
   - uid: 4943
@@ -41441,6 +41417,25 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: Pen
+  entities:
+  - uid: 394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.00797,12.565628
+      parent: 2
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 57.72277,46.028847
+      parent: 2
+  - uid: 396
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.62642,48.595196
+      parent: 2
 - proto: PenCap
   entities:
   - uid: 5033
@@ -46245,6 +46240,18 @@ entities:
     - type: Transform
       pos: 62.5,31.5
       parent: 2
+- proto: SpawnPointCCOperator
+  entities:
+  - uid: 4942
+    components:
+    - type: Transform
+      pos: 61.5,26.5
+      parent: 2
+  - uid: 7129
+    components:
+    - type: Transform
+      pos: 65.5,26.5
+      parent: 2
 - proto: SpeedLoaderMagnumAP
   entities:
   - uid: 2534

Resources/Prototypes/Maps/centcomm.yml

@@ -1,5 +1,5 @@
 - type: gameMap
-  id: centcommcorvax
+  id: CorvaxCentcomm
   mapName: 'Central Command'
   mapPath: /Maps/corvax_centcomm.yml
   minPlayers: 0
@@ -15,4 +15,3 @@
         - type: StationJobs
           availableJobs:
             CCOperator: [ 2, 2]
-            CCSecurity: [ 3, 3]

Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml

@@ -9,15 +9,3 @@
       layers:
         - state: green
         - state: captain
-
-- type: entity
-  id: SpawnPointCCSecurity
-  parent: SpawnPointJobBase
-  name: ЦК Охрана
-  components:
-    - type: SpawnPoint
-      job_id: CCSecurity
-    - type: Sprite
-      layers:
-        - state: green
-        - state: captain

Resources/Prototypes/_CorvaxNext/Roles/Jobs/CentCom/centcom_official.yml

@@ -4,30 +4,7 @@
   description: Оператор Центрального Командования. Истинный бюрократ.
   playTimeTracker: JobCentralCommandOperator
   setPreference: true
-  startingGear: CCOperator
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom2 # Corvax-JobSupervisors
-  whitelisted: true
-  canBeAntag: false
-  weight: 1
-  requireAdminNotify: true
-  joinNotifyCrew: true
-  setHideFromConsole: true
-  accessGroups:
-    - AllAccess
-  access:
-    - CentralCommand
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, TrackingImplant ]
-
-- type: job
-  id: CCSecurity
-  name: Служба Безопасности ЦентКом
-  description: Не звонит вам и не просит последние три цифры с карты.
-  playTimeTracker: JobCentralCommandSecurity
-  setPreference: true
-  startingGear: OfficerCentCom
+  startingGear: OperatorGear
   icon: "JobIconNanotrasen"
   supervisors: job-supervisors-centcom2 # Corvax-JobSupervisors
   whitelisted: true
@@ -45,10 +22,9 @@
     implants: [ MindShieldImplant, TrackingImplant ]
 
 - type: startingGear
-  id: Operator
+  id: OperatorGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomOfficer
-    back: ClothingBackpackFilled
     shoes: ClothingShoesBootsJack
     eyes: ClothingEyesGlassesSunglasses
     head: ClothingHeadHatBeretCentcomNaval
@@ -57,22 +33,6 @@
     pocket1: PenCentcom
     pocket2: BoxFolderCentComClipboard
     gloves: ClothingHandsGlovesCombat
-  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
-
-- type: startingGear
-  id: OfficerCentCom
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitHoSAlt
-    back: ClothingBackpackFilled
-    mask: ClothingMaskGasSecurity
-    shoes: ClothingShoesBootsJack
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasic
-    suitstorage: WeaponPistolMk58
-    head: ClothingHeadHatBeretHoS
-    id: CentcomPDA
-    ears: ClothingHeadsetCentCom
-    belt: ClothingBeltSecurity
-    pocket2: MagazinePistol
+  storage:
+    back:
+    - Flash

Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml

@@ -4,5 +4,4 @@
   description: Только по вайтлисту.
   color: "#13db0f"
   roles:
-    - CCSecurity
     - CCOperator

Resources/Prototypes/Backmen/Roles/play_time_trackers.yml Resources/Prototypes/_CorvaxNext/Roles/Jobs/play_time_trackers.yml

@@ -1,5 +1,2 @@
 - type: playTimeTracker
   id: JobCentralCommandOperator
-
-- type: playTimeTracker
-  id: JobCentralCommandSecurity

Resources/Prototypes/_CorvaxNext/centcomm_pool.yml

@@ -1,6 +1,6 @@
 - type: weightedRandom
   id: DefaultCentcomPool
   weights:
-    centcommcorvax: 1
+    CorvaxCentcomm: 1
 #    CentCommv2: 0.35 // soon
 #    CentCommv3: 0.7 // soon