Merge remote-tracking branch 'WD-core/master' into upstream-core

2025-03-16 22:42:21 +03:00
parent 8428783fbc dec6e28e42
commit d13428d35a
79 changed files with 24189 additions and 20582 deletions
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -120,8 +120,8 @@
    state: icon
  content:
  - MindSlaveImplanter
-  - MindSlaveImplanter
-  - MindSlaveImplanter
+  - SoapOmega
+  - BoxEncryptionKeySyndie
  - ClothingOuterCoatSyndieCap
  - ClothingHeadHatSyndieMAA

--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -30,6 +30,7 @@
  - type: Access
    groups:
    - AllAccess
+    - Everything # WD
    tags:
    - NuclearOperative
    - SyndicateAgent
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -639,6 +639,7 @@
  id: LostCargoTechnician
  randomizeName: false
  components:
+    - type: FillIDCard # WD
    - type: GhostRole
      name: ghost-role-information-lost-cargo-technical-name
      description: ghost-role-information-lost-cargo-technical-description
@@ -706,7 +707,23 @@
    - type: RandomMetadata
      nameSegments:
      - names_clown
-    - type: Pacified # WD
+    # WD Edit start
+    - type: Pacified
+    - type: Clumsy
+      clumsyDamage:
+        types:
+          Blunt: 5
+          Piercing: 4
+        groups:
+          Burn: 3
+    - type: SleepEmitSound
+      snore: /Audio/Voice/Misc/silly_snore.ogg
+      interval: 10
+    - type: FillIDCard
+      isContractor: true
+    - type: AddImplant
+      implants: [ SadTromboneImplant ]
+    # WD Edit end

 - type: randomHumanoidSettings
  id: ClownTroupeBanana
@@ -722,7 +739,23 @@
    - type: RandomMetadata
      nameSegments:
      - names_clown
-    - type: Pacified # WD
+    # WD Edit start
+    - type: Pacified
+    - type: Clumsy
+      clumsyDamage:
+        types:
+          Blunt: 5
+          Piercing: 4
+        groups:
+          Burn: 3
+    - type: SleepEmitSound
+      snore: /Audio/Voice/Misc/silly_snore.ogg
+      interval: 10
+    - type: FillIDCard
+      isContractor: true
+    - type: AddImplant
+      implants: [ SadTromboneImplant ]
+    # WD Edit end

 # Traveling exotic chef

@@ -767,6 +800,8 @@
      nameSegments:
      - names_first
      - names_last
+    - type: FillIDCard # WD
+      isContractor: true

 # Disaster victim

@@ -814,6 +849,7 @@
      settings: DisasterVictimCaptain

 - type: randomHumanoidSettings
+  parent: Nanotrasen # WD
  id: DisasterVictimResearchDirector
  randomizeName: false
  components:
@@ -830,8 +866,10 @@
      nameSegments:
      - names_first
      - names_last
+    - type: FillIDCard # WD

 - type: randomHumanoidSettings
+  parent: Nanotrasen # WD
  id: DisasterVictimCMO
  randomizeName: false
  components:
@@ -848,8 +886,10 @@
      nameSegments:
      - names_first
      - names_last
+    - type: FillIDCard # WD

 - type: randomHumanoidSettings
+  parent: Nanotrasen # WD
  id: DisasterVictimCaptain
  randomizeName: false
  components:
@@ -866,6 +906,9 @@
      nameSegments:
      - names_first
      - names_last
+    - type: FillIDCard # WD
+    - type: AddImplant # WD
+      implants: [ MindShieldImplant ]

 # Syndie Disaster Victim

--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -176,5 +176,6 @@
  - type: Access
    groups:
    - AllAccess
+    - Everything # WD
    tags:
    - CentralCommand
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -49,7 +49,7 @@
  abstract: true
  components:
    - type: StationCargoShuttle
-      path: /Maps/Shuttles/cargo.yml
+      path: /Maps/White/Shuttles/cargo.yml
    - type: GridSpawn
      groups:
 #        trade:
@@ -60,7 +60,7 @@
 #            - /Maps/Shuttles/trading_outpost.yml
        mining:
          paths:
-          - /Maps/Shuttles/mining.yml
+          - /Maps/White/Shuttles/mining.yml
        # Spawn last
        ruins:
          hide: true
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -385,7 +385,7 @@
    - id: MobGiantSpiderAngry
      prob: 0.05

- type: entity
+- type: entity # WD
  id: BorerSpawn
  parent: BaseGameRule
  noSpawn: true
@@ -433,6 +433,7 @@
    minimumPlayers: 30
    weight: 2
    duration: 1
+    maxOccurrences: 1 # WD
  - type: ZombieRule
  - type: AntagSelection
    definitions:
@@ -467,6 +468,7 @@
    weight: 4.5
    minimumPlayers: 20
    duration: 1
+    maxOccurrences: 2 # WD
  - type: LoadMapRule
    preloadedGrid: ShuttleStriker
  - type: NukeopsRule
@@ -499,8 +501,9 @@
  - type: StationEvent
    earliestStart: 30
    weight: 8
-    minimumPlayers: 20 # Amour from 15 to 20
-    maxOccurrences: 2 # Amour from 1 to 2
+    minimumPlayers: 15
+    reoccurrenceDelay: 30
+    maxOccurrences: 2 # WD
    startAnnouncement: station-event-communication-interception
    startAudio:
      path: /Audio/Announcements/intercept.ogg
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -46,6 +46,8 @@
      allowNonHumans: true
      multiAntagSetting: NotExclusive
      startingGear: ThiefGear
+      # components: # WD EDIT
+      # - type: Pacified
      mindComponents:
      - type: ThiefRole
        prototype: Thief
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -81,7 +81,7 @@
    selectionTime: PrePlayerSpawn
    definitions:
    - prefRoles: [ NukeopsCommander ]
-      fallbackRoles: [ Nukeops, NukeopsMedic ]
+    # fallbackRoles: [ Nukeops, NukeopsMedic ] # WD
      max: 1
      playerRatio: 10
      startingGear: SyndicateCommanderGearFull
@@ -100,7 +100,7 @@
      - type: NukeopsRole
        prototype: NukeopsCommander
    - prefRoles: [ NukeopsMedic ]
-      fallbackRoles: [ Nukeops, NukeopsCommander ]
+    # fallbackRoles: [ Nukeops, NukeopsCommander ] # WD
      max: 1
      playerRatio: 10
      startingGear: SyndicateOperativeMedicFull
@@ -118,7 +118,7 @@
      - type: NukeopsRole
        prototype: NukeopsMedic
    - prefRoles: [ Nukeops ]
-      fallbackRoles: [ NukeopsCommander, NukeopsMedic ]
+    # fallbackRoles: [ NukeopsCommander, NukeopsMedic ] # WD
      min: 0
      max: 3
      playerRatio: 10
@@ -316,6 +316,7 @@
        color: Aqua
      startingGear: WizardGear
      components:
+      - type: Unslavable # WD
      - type: Wizard
      - type: WizardAppearance
      - type: GlobalAntagonist
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -316,12 +316,12 @@
 - type: startingGear
  id: BananaClown
  equipment:
-    id: ClownPDA
+    id: ClownIDCardContractor # WD
    back: ClothingBackpackClown
    shoes: ClothingShoesClownBanana
    jumpsuit: ClothingUniformJumpsuitClownBanana
    mask: ClothingMaskClownBanana
-    ears: ClothingHeadsetService
+    ears: ClothingHeadsetServiceContractor # WD
    pocket1: BikeHorn
    pocket2: ClownRecorder

@@ -331,9 +331,9 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitClown
    shoes: ClothingShoesClown
-    id: ClownPDA
+    id: ClownIDCardContractor # WD
    back: ClothingBackpackClown
-    ears: ClothingHeadsetService
+    ears: ClothingHeadsetServiceContractor # WD
    mask: ClothingMaskClown
    pocket1: BikeHorn
    pocket2: ClownRecorder
@@ -345,9 +345,9 @@
    jumpsuit: ClothingUniformJumpsuitCargo
    shoes: ClothingShoesColorBlack
    head: ClothingHeadHatCargosoft
-    id: CargoPDA
+    id: CargoPDAAnotherSector # WD
    back: ClothingBackpackCargo
-    ears: ClothingHeadsetCargo
+    ears: ClothingHeadsetCargoAnotherSector # WD
    pocket1: AppraisalTool

 - type: startingGear
@@ -356,9 +356,9 @@
    jumpsuit: ClothingUniformJumpsuitCargo
    shoes: ClothingShoesBootsWinterCargo
    head: ClothingHeadHatCargosoft
-    id: CargoPDA
+    id: CargoPDAAnotherSector # WD
    back: ClothingBackpackDuffelCargo
-    ears: ClothingHeadsetCargo
+    ears: ClothingHeadsetCargoAnotherSector # WD
    pocket1: AppraisalTool
    outerClothing: ClothingOuterWinterCargo

@@ -368,9 +368,9 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitChef
    shoes: ClothingShoesColorWhite
-    id: ChefPDA
+    id: ChefIDCardContractor # WD
    back: ClothingBackpackSatchel
-    ears: ClothingHeadsetService
+    ears: ClothingHeadsetServiceContractor # WD
    belt: ClothingBeltChef

 #CMO Disaster Victim
@@ -381,9 +381,9 @@
    shoes: ClothingShoesColorBrown
    head: ClothingHeadMirror
    neck: ClothingCloakCmo
-    id: CMOPDA
-    back: ClothingBackpackMedical
-    ears: ClothingHeadsetCMO
+    id: CMOPDAAnotherSector # WD
+    back: ClothingBackpackMedicalAnotherSector # WD
+    ears: ClothingHeadsetCMOAnotherSector # WD
    belt: ClothingBeltMedical
    outerClothing: ClothingOuterCoatLabCmo

@@ -394,9 +394,9 @@
    shoes: ClothingShoesColorBrown
    head: ClothingHeadHatBeretCmo
    neck: ClothingNeckMantleCMO
-    id: CMOPDA
-    back: ClothingBackpackSatchelMedical
-    ears: ClothingHeadsetCMO
+    id: CMOPDAAnotherSector # WD
+    back: ClothingBackpackSatchelMedicalAnotherSector # WD
+    ears: ClothingHeadsetCMOAnotherSector # WD
    belt: ClothingBeltMedical
    outerClothing: ClothingOuterCoatLabCmo

@@ -410,9 +410,9 @@
    gloves: ClothingHandsGlovesCaptain
    head: ClothingHeadHatCaptain
    neck: ClothingNeckCloakCap
-    id: CaptainPDA
-    back: ClothingBackpackCaptain
-    ears: ClothingHeadsetAltCommand
+    id: CaptainPDAAnotherSector # WD
+    back: ClothingBackpackCaptainAnotherSector # WD
+    ears: ClothingHeadsetAltCommandAnotherSector # WD
    outerClothing: ClothingOuterArmorCaptainCarapace

 - type: startingGear
@@ -424,9 +424,9 @@
    gloves: ClothingHandsGlovesCaptain
    head: ClothingHeadHatCapcap
    neck: ClothingNeckMantleCap
-    id: CaptainPDA
-    back: ClothingBackpackSatchelCaptain
-    ears: ClothingHeadsetAltCommand
+    id: CaptainPDAAnotherSector # WD
+    back: ClothingBackpackSatchelCaptainAnotherSector # WD
+    ears: ClothingHeadsetAltCommandAnotherSector # WD
    outerClothing: ClothingOuterArmorCaptainCarapace

 #RD Disaster Victim
@@ -437,9 +437,9 @@
    shoes: ClothingShoesColorBrown
    head: ClothingHeadHatBeretRND
    neck: ClothingNeckCloakRd
-    id: RnDPDA
-    back: ClothingBackpackScience
-    ears: ClothingHeadsetRD
+    id: RnDPDAAnotherSector # WD
+    back: ClothingBackpackScienceAnotherSector # WD
+    ears: ClothingHeadsetRDAnotherSector # WD
    outerClothing: ClothingOuterCoatRD

 - type: startingGear
@@ -449,7 +449,7 @@
    shoes: ClothingShoesColorBrown
    head: ClothingHeadHatBeretRND
    neck: ClothingNeckMantleRD
-    id: RnDPDA
-    back: ClothingBackpackSatchelScience
-    ears: ClothingHeadsetRD
+    id: RnDPDAAnotherSector # WD
+    back: ClothingBackpackSatchelScienceAnotherSector # WD
+    ears: ClothingHeadsetRDAnotherSector # WD
    outerClothing: ClothingOuterCoatRD
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -156,16 +156,3 @@

 - type: playTimeTracker
  id: JobZookeeper
-
-# WHITE
- type: playTimeTracker
-  id: JobInspector
-
- type: playTimeTracker
-  id: JobBomzh
-
- type: playTimeTracker
-  id: JobBrigmedic
-
- type: playTimeTracker
-  id: JobMaid
--- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
+++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
@@ -1,16 +1,16 @@
 - type: preloadedGrid
  id: ShuttleStriker
-  path: /Maps/Shuttles/ShuttleEvent/striker.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/striker.yml
  copies: 2

 - type: preloadedGrid
  id: ShuttleCargoLost
-  path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/lost_cargo.yml
  copies: 1 # WD from 2 to 1

 - type: preloadedGrid
  id: TravelingCuisine
-  path: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/traveling_china_cuisine.yml
  copies: 1 # WD from 2 to 1

 - type: preloadedGrid
@@ -20,10 +20,10 @@

 - type: preloadedGrid
  id: Honki
-  path: /Maps/Shuttles/ShuttleEvent/honki.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/honki.yml
  copies: 1

 - type: preloadedGrid
  id: SyndieEvacPod
-  path: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml
+  path: /Maps/White/Shuttles/ShuttleEvent/syndie_evacpod.yml
  copies: 1 # WD from 2 to 1
--- a/Resources/Prototypes/_White/Access/misc.yml
+++ b/Resources/Prototypes/_White/Access/misc.yml
@@ -0,0 +1,18 @@
+- type: accessGroup
+  id: Everything
+  tags:
+  - AllAccess
+  - NuclearOperative
+  - SyndicateAgent
+  - CentralCommand
+  - Mercenary
+  - ClownContractor
+  - ChefContractor
+
+- type: accessLevel
+  id: ClownContractor
+  name: Клоун контрактник
+
+- type: accessLevel
+  id: ChefContractor
+  name: Шеф-повар контрактник
--- a/Resources/Prototypes/_White/Catalog/uplink.yml
+++ b/Resources/Prototypes/_White/Catalog/uplink.yml
@@ -278,7 +278,7 @@
  description: uplink-mind-slave-desc
  productEntity: MindSlaveImplanter
  cost:
-    Telecrystal: 6
+    Telecrystal: 10
  categories:
  - UplinkImplants

--- a/Resources/Prototypes/_White/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Back/backpacks.yml
@@ -0,0 +1,31 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackMedical
+  id: ClothingBackpackMedicalAnotherSector
+  components:
+  - type: StorageFill
+    contents:
+      - id: OmnizineChemistryBottle
+      - id: OmnizineChemistryBottle
+      - id: OmnizineChemistryBottle
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackCaptain
+  id: ClothingBackpackCaptainAnotherSector
+  components:
+  - type: StorageFill
+    contents:
+      - id: SpaceCash30000
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackScience
+  id: ClothingBackpackScienceAnotherSector
+  components:
+  - type: StorageFill
+    contents:
+      - id: ResearchDisk10000
+      - id: ResearchDisk10000
+      - id: ResearchDisk10000
+      - id: ResearchDisk10000
--- a/Resources/Prototypes/_White/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Back/satchel.yml
@@ -0,0 +1,31 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelMedical
+  id: ClothingBackpackSatchelMedicalAnotherSector
+  components:
+  - type: StorageFill
+    contents:
+      - id: OmnizineChemistryBottle
+      - id: OmnizineChemistryBottle
+      - id: OmnizineChemistryBottle
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelCaptain
+  id: ClothingBackpackSatchelCaptainAnotherSector
+  components:
+  - type: StorageFill
+    contents:
+      - id: SpaceCash30000
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelScience
+  id: ClothingBackpackSatchelScienceAnotherSector
+  components:
+  - type: StorageFill
+    contents:
+      - id: ResearchDisk10000
+      - id: ResearchDisk10000
+      - id: ResearchDisk10000
+      - id: ResearchDisk10000
--- a/Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml
@@ -0,0 +1,54 @@
+- type: entity
+  parent: ClothingHeadsetAltCommand
+  id: ClothingHeadsetAltCommandAnotherSector
+  suffix: Another Sector
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyStationMasterAnotherSector
+
+- type: entity
+  parent: ClothingHeadsetMedical
+  id: ClothingHeadsetCMOAnotherSector
+  suffix: Another Sector
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyMedicalAnotherSector
+      - EncryptionKeyCommandAnotherSector
+      - EncryptionKeyCommon
+
+- type: entity
+  parent: ClothingHeadsetScience
+  id: ClothingHeadsetRDAnotherSector
+  suffix: Another Sector
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyScienceAnotherSector
+      - EncryptionKeyCommandAnotherSector
+      - EncryptionKeyCommon
+
+- type: entity
+  parent: ClothingHeadsetCargo
+  id: ClothingHeadsetCargoAnotherSector
+  suffix: Another Sector
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCargoAnotherSector
+      - EncryptionKeyCommon
+
+- type: entity
+  parent: ClothingHeadsetService
+  id: ClothingHeadsetServiceContractor
+  noSpawn: true
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon
--- a/Resources/Prototypes/_White/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Devices/encryption_keys.yml
@@ -0,0 +1,67 @@
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyStationMasterAnotherSector
+  name: station master encryption key
+  description: An encryption key used by station's bosses. Unfortunately, the encryption codes in this sector are different.
+  suffix: Another Sector
+  components:
+  - type: EncryptionKey
+    channels:
+    - Common
+    defaultChannel: Common
+  - type: Sprite
+    layers:
+    - state: crypt_gold
+    - state: cap_label
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyMedicalAnotherSector
+  name: medical encryption key
+  description: An encryption key used by those who save lives. Unfortunately, the encryption codes in this sector are different.
+  suffix: Another Sector
+  components:
+  - type: EncryptionKey
+  - type: Sprite
+    layers:
+    - state: crypt_gray
+    - state: med_label
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyCommandAnotherSector
+  name: command encryption key
+  description: An encryption key used by crew's bosses. Unfortunately, the encryption codes in this sector are different.
+  suffix: Another Sector
+  components:
+  - type: EncryptionKey
+  - type: Sprite
+    layers:
+    - state: crypt_silver
+    - state: com_label
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyScienceAnotherSector
+  name: science encryption key
+  description: An encryption key used by scientists. Maybe it is plasmaproof? Unfortunately, the encryption codes in this sector are different.
+  suffix: Another Sector
+  components:
+  - type: EncryptionKey
+  - type: Sprite
+    layers:
+    - state: crypt_gray
+    - state: sci_label
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyCargoAnotherSector
+  name: cargo encryption key
+  description: An encryption key used by supply employees. Unfortunately, the encryption codes in this sector are different.
+  suffix: Another Sector
+  components:
+  - type: EncryptionKey
+  - type: Sprite
+    layers:
+    - state: crypt_gray
+    - state: cargo_label
--- a/Resources/Prototypes/_White/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Devices/pda.yml
@@ -0,0 +1,41 @@
+- type: entity
+  parent: CargoPDA
+  id: CargoPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: CargoIDCardAnotherSector
+    state: pda-cargo
+
+- type: entity
+  parent: CMOPDA
+  id: CMOPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: CMOIDCardAnotherSector
+    state: pda-cmo
+
+- type: entity
+  parent: CaptainPDA
+  id: CaptainPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: CaptainIDCardAnotherSector
+    state: pda-captain
+    penSlot:
+      startingItem: PenCap
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+
+- type: entity
+  parent: RnDPDA
+  id: RnDPDAAnotherSector
+  noSpawn: true
+  components:
+  - type: Pda
+    id: RDIDCardAnotherSector
+    state: pda-rd
--- a/Resources/Prototypes/_White/Entities/Objects/Misc/airlocks.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Misc/airlocks.yml
@@ -0,0 +1,235 @@
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsClownContractor
+  suffix: ClownContractor, Locked
+  components:
+  - type: AccessReader
+    access: [["ClownContractor"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockClownContractorLocked
+  suffix: ClownContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockClownContractorGlassLocked
+  suffix: ClownContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockShuttle
+  id: AirlockClownContractorShuttleLocked
+  suffix: ClownContractor, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockClownContractorGlassShuttleLocked
+  suffix: ClownContractor, Glass, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: Windoor
+  id: WindoorClownContractorLocked
+  suffix: ClownContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureClownContractorLocked
+  suffix: ClownContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorPlasma
+  id: PlasmaWindoorClownContractorLocked
+  suffix: ClownContractor, Locked, Plasma
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorUranium
+  id: UraniumWindoorClownContractorLocked
+  suffix: ClownContractor, Locked, Uranium
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureClownContractorLocked
+  suffix: ClownContractor, Locked, Plasma
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecureUranium
+  id: UraniumWindoorSecureClownContractorLocked
+  suffix: ClownContractor, Locked, Uranium
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClownContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChefContractor
+  suffix: ChefContractor, Locked
+  components:
+  - type: AccessReader
+    access: [["ChefContractor"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockChefContractorLocked
+  suffix: ChefContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockChefContractorGlassLocked
+  suffix: ChefContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockShuttle
+  id: AirlockChefContractorShuttleLocked
+  suffix: ChefContractor, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockChefContractorGlassShuttleLocked
+  suffix: ChefContractor, Glass, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: Windoor
+  id: WindoorChefContractorLocked
+  suffix: ChefContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureChefContractorLocked
+  suffix: ChefContractor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorPlasma
+  id: PlasmaWindoorChefContractorLocked
+  suffix: ChefContractor, Locked, Plasma
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorUranium
+  id: UraniumWindoorChefContractorLocked
+  suffix: ChefContractor, Locked, Uranium
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureChefContractorLocked
+  suffix: ChefContractor, Locked, Plasma
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecureUranium
+  id: UraniumWindoorSecureChefContractorLocked
+  suffix: ChefContractor, Locked, Uranium
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChefContractor ]
+  - type: Wires
+    layoutId: AirlockArmory
--- a/Resources/Prototypes/_White/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Misc/identification_cards.yml
@@ -0,0 +1,51 @@
+- type: entity
+  parent: CargoIDCard
+  id: CargoIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: CargoTechnicianAnotherSector
+
+- type: entity
+  parent: CMOIDCard
+  id: CMOIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: ChiefMedicalOfficerAnotherSector
+
+- type: entity
+  parent: CaptainIDCard
+  id: CaptainIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: CaptainAnotherSector
+
+- type: entity
+  parent: RDIDCard
+  id: RDIDCardAnotherSector
+  noSpawn: true
+  components:
+  - type: PresetIdCard
+    job: ResearchDirectorAnotherSector
+
+- type: entity
+  parent: IDCardStandard
+  id: ClownIDCardContractor
+  components:
+  - type: Sprite
+    layers:
+    - state: non_faction
+  - type: PresetIdCard
+    job: ClownContractor
+
+- type: entity
+  parent: IDCardStandard
+  id: ChefIDCardContractor
+  components:
+  - type: Sprite
+    layers:
+    - state: non_faction
+  - type: PresetIdCard
+    job: ChefContractor
--- a/Resources/Prototypes/_White/Roles/Jobs/misc.yml
+++ b/Resources/Prototypes/_White/Roles/Jobs/misc.yml
@@ -0,0 +1,51 @@
+- type: job
+  id: CargoTechnicianAnotherSector
+  name: job-name-cargotech
+  description: job-description-cargotech
+  playTimeTracker: JobCargoTechnicianAnotherSector
+  icon: "JobIconCargoTechnician"
+  supervisors: job-supervisors-qm
+
+- type: job
+  id: ChiefMedicalOfficerAnotherSector
+  name: job-name-cmo
+  description: job-description-cmo
+  playTimeTracker: JobChiefMedicalOfficerAnotherSector
+  icon: "JobIconChiefMedicalOfficer"
+  supervisors: job-supervisors-captain
+
+- type: job
+  id: CaptainAnotherSector
+  name: job-name-captain
+  description: job-description-captain
+  playTimeTracker: JobCaptainAnotherSector
+  icon: "JobIconCaptain"
+  supervisors: job-supervisors-centcom
+
+- type: job
+  id: ResearchDirectorAnotherSector
+  name: job-name-rd
+  description: job-description-rd
+  playTimeTracker: JobResearchDirectorAnotherSector
+  icon: "JobIconResearchDirector"
+  supervisors: job-supervisors-captain
+
+- type: job
+  id: ClownContractor
+  name: клоун контрактник
+  description: job-description-clown
+  playTimeTracker: JobClownContractor
+  icon: "JobIconVisitor"
+  supervisors: job-supervisors-hop
+  access:
+  - ClownContractor
+
+- type: job
+  id: ChefContractor
+  name: шеф-повар контрактник
+  description: job-description-chef
+  playTimeTracker: JobChefContractor
+  icon: "JobIconVisitor"
+  supervisors: job-supervisors-hop
+  access:
+  - ChefContractor
--- a/Resources/Prototypes/_White/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_White/Roles/play_time_trackers.yml
@@ -0,0 +1,32 @@
+- type: playTimeTracker
+  id: JobInspector
+
+- type: playTimeTracker
+  id: JobBomzh
+
+- type: playTimeTracker
+  id: JobBrigmedic
+
+- type: playTimeTracker
+  id: JobMaid
+
+- type: playTimeTracker
+  id: JobCargoTechnicianAnotherSector
+
+- type: playTimeTracker
+  id: JobChiefMedicalOfficerAnotherSector
+
+- type: playTimeTracker
+  id: JobCaptainAnotherSector
+
+- type: playTimeTracker
+  id: JobResearchDirectorAnotherSector
+
+- type: playTimeTracker
+  id: JobClownContractor
+
+- type: playTimeTracker
+  id: JobChefContractor
+
+- type: playTimeTracker
+  id: JobMercenary
--- a/Resources/Prototypes/_White/Structures/Machines/deepspacecom.yml
+++ b/Resources/Prototypes/_White/Structures/Machines/deepspacecom.yml
@@ -19,8 +19,8 @@
    supportedChannels:
    - DeepSpace
    - Common
-  - type: TTS # check tts work
-    id: Sentrybot
+  - type: TTS
+    voicePrototypeId: Sentrybot
  - type: Speech
    speechVerb: Robotic
  - type: Sprite # replace sprites in future
@@ -60,3 +60,75 @@
    state: cpu_command
  - type: ComputerBoard
    prototype: ComputerDeepSpaceCom
+
+- type: entity
+  parent: BaseWallConsole
+  id: DeepSpaceComWallMount
+  name: настенная консоль дальней связи
+  description: Дальняя космическая связь обеспечивает быстрый обмен сообщениями почти на любом расстоянии. Корпорация слышит!
+  components:
+  - type: Sprite
+    sprite: White/Structures/Machines/wall_consoles.rsi
+    layers:
+    - map: [ "computerLayerBody" ]
+      state: comp_wall_0
+    - map: [ "computerLayerScreen" ]
+      state: comm_layer
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ComputerVisuals.Powered:
+        computerLayerScreen:
+          True: { visible: true, shader: unshaded }
+          False: { visible: false }
+        computerLayerKeys:
+          True: { visible: true, shader: unshaded }
+          False: { visible: true }
+  - type: ApcPowerReceiver
+  - type: Electrified
+    enabled: false
+    usesApcPower: true
+  - type: RadioMicrophone
+    powerRequired: true
+    unobstructedRequired: true
+    listenRange: 2
+    toggleOnInteract: false
+  - type: RadioSpeaker
+    toggleOnInteract: false
+  - type: DeepSpaceCom
+    supportedChannels:
+    - DeepSpace
+    - Common
+  - type: TTS
+    voicePrototypeId: Sentrybot
+  - type: Speech
+    speechVerb: Robotic
+  - type: ActivatableUI
+    key: enum.DeepSpaceComUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.DeepSpaceComUiKey.Key:
+        type: DeepSpaceComBoundUI
+  - type: Computer
+    board: DeepSpaceComComputerWallMountCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#3c5eb5"
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StrongMetallic
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: DeepSpaceComComputerWallMountCircuitboard
+  name: плата настенной консоли заказа грузов
+  description: Плата для создания настенной консоли заказа грузов.
+  components:
+  - type: Sprite
+    state: cpu_command
+  - type: ComputerBoard
+    prototype: DeepSpaceComWallMount
+  - type: Tag
+    tags:
+    - WallMountConsoleElectronics
--- a/Resources/Prototypes/_White/_Engi/Entities/Mobs/annoying_fly.yml
+++ b/Resources/Prototypes/_White/_Engi/Entities/Mobs/annoying_fly.yml
@@ -0,0 +1,68 @@
+- type: entity
+  name: надоедливая муха
+  parent: [ SimpleMobBase, FlyingMobBase ]
+  id: AnnoyingFly
+  description: Раздражает.
+  components:
+  - type: CombatMode
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 7
+    baseSprintSpeed : 7
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: 0
+      sprite: White/_Engi/Mobs/Animals/fly.rsi
+      scale: 0.7, 0.7
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.1
+        density: 30
+        mask:
+        - FlyingMobMask
+        layer:
+        - FlyingMobLayer
+  - type: MobState
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      5: Dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: 0
+      Dead:
+        Base: dead
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Bee
+    - Trash
+  - type: MobPrice
+    price: 50
+  - type: FactionException
+  - type: NpcFactionMember
+    factions:
+    - Passive
+  - type: ZombieImmune
+  - type: MeleeWeapon
+    altDisarm: false
+    angle: 0
+    animation: WeaponArcBite
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      groups:
+        Brute: 1
+  - type: AmbientSound
+    volume: -4
+    range: 4
+    sound:
+      path: /Audio/White/Ambience/Fly/mosquito.ogg
+  - type: CanEscapeInventory
+    baseResistTime: 0.4
--- a/Resources/Prototypes/_White/mercenary.yml
+++ b/Resources/Prototypes/_White/mercenary.yml
@@ -16,7 +16,7 @@
    - id: Tourniquet
    - id: Lighter
    - id: CigPackBlack
-    - id: SpaceCash500
+    - id: SpaceCash5000
    - id: FlashlightLantern

 - type: startingGear
@@ -79,6 +79,8 @@
    nameSegments:
    - names_first
    - names_last
+  - type: FillIDCard
+    isContractor: true

 # Book
 - type: entity
@@ -120,7 +122,7 @@
 # Airlock
 - type: accessLevel
  id: Mercenary
-  name: id-card-access-level-mercenary
+  name: Наёмник

 - type: entity
  parent: DoorElectronics
@@ -139,9 +141,17 @@
  - type: Sprite
    layers:
    - state: non_faction
-  - type: Access
-    tags:
-    - Mercenary
+  - type: PresetIdCard
+    job: Mercenary
+
+- type: job
+  id: Mercenary
+  name: наёмник
+  description: ghost-role-information-mercenary-standard-description
+  playTimeTracker: JobMercenary
+  icon: "JobIconVisitor"
+  access:
+  - Mercenary

 - type: entity
  parent: Airlock
@@ -154,3 +164,101 @@
  - type: Wires
    layoutId: AirlockArmory

+- type: entity
+  parent: AirlockGlass
+  id: AirlockMercenaryGlassLocked
+  suffix: Mercenary, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockShuttle
+  id: AirlockMercenaryShuttleLocked
+  suffix: Mercenary, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockMercenaryGlassShuttleLocked
+  suffix: Mercenary, Glass, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: Windoor
+  id: WindoorMercenaryLocked
+  suffix: Mercenary, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureMercenaryLocked
+  suffix: Mercenary, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorPlasma
+  id: PlasmaWindoorMercenaryLocked
+  suffix: Mercenary, Locked, Plasma
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorUranium
+  id: UraniumWindoorMercenaryLocked
+  suffix: Mercenary, Locked, Uranium
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureMercenaryLocked
+  suffix: Mercenary, Locked, Plasma
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory
+
+- type: entity
+  parent: WindoorSecureUranium
+  id: UraniumWindoorSecureMercenaryLocked
+  suffix: Mercenary, Locked, Uranium
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
+  - type: Wires
+    layoutId: AirlockArmory