again smoll fixes (#546)

Rxup · Apr 6, 2024 · ef2b00c · ef2b00c
1 parent f941cae
commit ef2b00c
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 34 deletions.
diff --git a/Resources/Prototypes/Backmen/Diseases/infectious.yml b/Resources/Prototypes/Backmen/Diseases/infectious.yml
@@ -231,6 +231,15 @@
   - !type:DiseaseSnough
     probability: 0.025
     emote: Yawn
+  cures:
+  - !type:DiseaseReagentCure
+    reagent:
+      ReagentId: Coffee
+    min: 35
+  - !type:DiseaseReagentCure
+    reagent:
+      ReagentId: IrishCoffee
+    min: 10
 
 - type: disease
   id: BleedersBite

diff --git a/Resources/Prototypes/Backmen/Entities/Mobs/Player/Silicons/BPLA.yml b/Resources/Prototypes/Backmen/Entities/Mobs/Player/Silicons/BPLA.yml
@@ -40,18 +40,21 @@
     - key: enum.SiliconLawsUiKey.Key
       type: SiliconLawBoundUserInterface
   - type: GhostRole
-    #whitelistRequired: true
+    whitelistRequired: false
     makeSentient: true
     allowSpeech: true # backmen
     allowMovement: true # backmen
     name: Блюспейс Дрон #ghost-role-information-drone-name # backmen
     description: ghost-role-information-drone-description # backmen
     requirements:
       - !type:OverallPlaytimeRequirement
-        time: 36000
-      - !type:RoleTimeRequirement
-        role: JobChiefEngineer
         time: 24000
+      - !type:DepartmentTimeRequirement
+        department: Engineering
+        time: 14400
+      - !type:RoleTimeRequirement
+        role: JobCentralCommandAssistant
+        time: 18000
     rules: | # backmen
       Вы обязаны подчиняться законам, которые будут доступны вам после вселения, если вам не скажут иное в Ahelp.
   - type: GhostTakeoverAvailable

diff --git a/Resources/Prototypes/Backmen/Entities/Mobs/Player/Silicons/BPLA_MED.yml b/Resources/Prototypes/Backmen/Entities/Mobs/Player/Silicons/BPLA_MED.yml
@@ -86,18 +86,21 @@
     - key: enum.SiliconLawsUiKey.Key
       type: SiliconLawBoundUserInterface
   - type: GhostRole
-    #whitelistRequired: true
+    whitelistRequired: false
     makeSentient: true
     allowSpeech: true # backmen
     allowMovement: true # backmen
     name: Блюспейс Дрон Меда #ghost-role-information-drone-name # backmen
     description: ghost-role-information-drone-description # backmen
     requirements:
       - !type:OverallPlaytimeRequirement
-        time: 36000
-      - !type:RoleTimeRequirement
-        role: JobChiefMedicalOfficer
         time: 24000
+      - !type:DepartmentTimeRequirement
+        department: Medical
+        time: 14400
+      - !type:RoleTimeRequirement
+        role: JobCentralCommandAssistant
+        time: 18000
     rules: | # backmen
      Вы обязаны подчиняться законам, которые будут доступны вам после вселения, если вам не скажут иное в Ahelp.
   - type: GhostTakeoverAvailable

diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Backmen/Entities/Objects/Devices/Electronics/door_access.yml
@@ -0,0 +1,39 @@
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCCCargo
+  suffix: CentCom, Cargo, Locked
+  components:
+  - type: AccessReader
+    access: [["CCCargo"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCCSecurity
+  suffix: CentCom, Security, Locked
+  components:
+  - type: AccessReader
+    access: [["CCSecurity"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCentCom
+  suffix: CentCom, Locked
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCCOfficer
+  suffix: CentCom, Officer Locked
+  components:
+  - type: AccessReader
+    access: [["CCOfficer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCCAdmiral
+  suffix: CentCom, Admiral Locked
+  components:
+  - type: AccessReader
+    access: [["CCAdmiral"]]
diff --git a/Resources/Prototypes/Backmen/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Backmen/Entities/Structures/Doors/Airlocks/access.yml
@@ -5,8 +5,9 @@
   name: Бронированная дверь ЦК
   suffix: CentCom, Locked
   components:
-    - type: AccessReader
-      access: [["CentralCommand"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCentCom ]
     - type: PaintableAirlock
       group: Glass
       department: null
@@ -24,8 +25,9 @@
   name: Бронированная дверь ЦК
   suffix: CentCom, Armory, Locked
   components:
-    - type: AccessReader
-      access: [["CCSecurity"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCCSecurity ]
     - type: PaintableAirlock
       group: Glass
       department: null
@@ -43,8 +45,9 @@
   name: Бронированная дверь ЦК
   suffix: CentCom, Officer, Locked
   components:
-    - type: AccessReader
-      access: [["CCOfficer"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCCOfficer ]
     - type: PaintableAirlock
       group: Glass
       department: null
@@ -62,8 +65,9 @@
   name: Бронированная дверь каюты Адмирала ЦК
   suffix: CentCom, Admiral, Locked
   components:
-    - type: AccessReader
-      access: [["CCAdmiral"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCCOfficer ]
     - type: PaintableAirlock
       group: Glass
       department: null
@@ -82,17 +86,19 @@
   name: Шлюз ЦК
   suffix: CentCom, Cargo, Locked
   components:
-    - type: AccessReader
-      access: [["CCCargo"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCCCargo ]
 
 - type: entity
   parent: AirlockSecurity
   id: AirlockCCSecurityLocked
   name: Шлюз ЦК
   suffix: CentCom, Security, Locked
   components:
-    - type: AccessReader
-      access: [["CCSecurity"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCCSecurity ]
     - type: Wires
       LayoutId: AirlockSecurity
 
@@ -102,17 +108,19 @@
   name: Шлюз ЦК
   suffix: CentCom, Engineering, Locked
   components:
-    - type: AccessReader
-      access: [["CentralCommand"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCentCom ]
 
 - type: entity
   parent: AirlockMedical
   id: AirlockCCMedicalLocked
   name: Шлюз ЦК
   suffix: CentCom, Medical, Locked
   components:
-    - type: AccessReader
-      access: [["CentralCommand"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCentCom ]
 
 #Hatches
 - type: entity
@@ -121,26 +129,29 @@
   name: CentCom Hatch
   suffix: CentCom, Locked
   components:
-    - type: AccessReader
-      access: [["CentralCommand"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCentCom ]
 
 - type: entity
   parent: AirlockHatchMaint
   id: AirlockHatchMaintLocked
   name: Maintenance Hatch
   suffix: Maint, Locked
   components:
-    - type: AccessReader
-      access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockHatchCentcomm
   id: AirlockHatchSyndicateLocked
   name: Syndicate Hatch
   suffix: Syndicate, Locked
   components:
-    - type: AccessReader
-      access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 #DoubleAirlocks
 
@@ -150,14 +161,16 @@
   name: Double Glass Airlock
   suffix: CentCom, Locked
   components:
-    - type: AccessReader
-      access: [["CentralCommand"]]
+    - type: ContainerFill
+      containers:
+        board: [ DoorElectronicsCentCom ]
 
 - type: entity
   parent: DoubleGlassAirlock
   id: DoubleGlassAirlockSyndicateLocked
   name: Double Glass Airlock
   suffix: Syndicate, Locked
   components:
-    - type: AccessReader
-      access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]