Много чего

2025-03-16 18:00:19 +03:00
parent 77f3f0ee70
commit c6eda2a60a
24 changed files with 1385 additions and 271 deletions
--- 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

@@ -831,6 +866,7 @@
      nameSegments:
      - names_first
      - names_last
+    - type: FillIDCard # WD

 - type: randomHumanoidSettings
  parent: Nanotrasen # WD
@@ -850,6 +886,7 @@
      nameSegments:
      - names_first
      - names_last
+    - type: FillIDCard # WD

 - type: randomHumanoidSettings
  parent: Nanotrasen # WD
@@ -869,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/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -313,7 +313,7 @@
 - type: startingGear
  id: BananaClown
  equipment:
-    id: ClownPDA # TODO
+    id: ClownIDCardContractor # WD
    back: ClothingBackpackClown
    shoes: ClothingShoesClownBanana
    jumpsuit: ClothingUniformJumpsuitClownBanana
@@ -328,7 +328,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitClown
    shoes: ClothingShoesClown
-    id: ClownPDA # TODO
+    id: ClownIDCardContractor # WD
    back: ClothingBackpackClown
    ears: ClothingHeadsetServiceContractor # WD
    mask: ClothingMaskClown
@@ -365,7 +365,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitChef
    shoes: ClothingShoesColorWhite
-    id: ChefPDA # TODO
+    id: ChefIDCardContractor # WD
    back: ClothingBackpackSatchel
    ears: ClothingHeadsetServiceContractor # WD
    belt: ClothingBeltChef
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -156,28 +156,3 @@

 - type: playTimeTracker
  id: JobZookeeper
-
-# WHITE
- 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
--- 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/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
@@ -29,3 +29,23 @@
  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/another_sector.yml
+++ b/Resources/Prototypes/_White/Roles/Jobs/another_sector.yml
@@ -21,9 +21,6 @@
  playTimeTracker: JobCaptainAnotherSector
  icon: "JobIconCaptain"
  supervisors: job-supervisors-centcom
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]

 - type: job
  id: ResearchDirectorAnotherSector
@@ -32,3 +29,23 @@
  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/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