Minor Borg Qol (#21548)

* boirg stuff * gaming * modules shits * mini welder is too lmao * pro * cheaper recipes, fix mob state thresholds, remove silly crayon, rename module * generic borg 6 module * literacy module shityourself
2023-11-09 15:22:50 -07:00
parent 5cc157e594
commit 5d46bbb615
6 changed files with 182 additions and 63 deletions
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -19,6 +19,7 @@
      path: /Audio/Effects/hit_kick.ogg
  - type: Clickable
  - type: CombatMode
+  - type: NoSlip
  - type: StaticPrice
    price: 1250
  - type: InteractionOutline
@@ -48,7 +49,7 @@
  - type: MobThresholds
    thresholds:
      0: Alive
-      100: Dead
+      150: Dead
    stateAlertDict:
      Alive: BorgHealth
    showOverlays: false
@@ -79,10 +80,13 @@
  - type: IntrinsicRadioTransmitter
    channels:
    - Binary
+    - Common
+    - Science
  - type: ActiveRadio
    channels:
    - Binary
    - Common
+    - Science
  - type: ZombieImmune
  - type: Repairable
    doAfterDelay: 10
@@ -135,7 +139,7 @@
    thresholds:
    - trigger:
        !type:DamageTrigger
-        damage: 50
+        damage: 75
      behaviors:
      - !type:PlaySoundBehavior
        sound:
@@ -144,7 +148,7 @@
            volume: 5
    - trigger:
        !type:DamageTrigger
-        damage: 100
+        damage: 150
      behaviors:
      - !type:PlaySoundBehavior
        sound: /Audio/Effects/metalbreak.ogg
@@ -152,6 +156,7 @@
        containers:
        - borg_brain
        - borg_module
+        - cell_slot
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
  - type: HandheldLight
@@ -206,3 +211,7 @@
    enabled: false
    groups:
    - AllAccess
+  - type: Lock
+    locked: true
+  - type: AccessReader
+    access: [["Command"], ["Research"]]
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -14,7 +14,7 @@
      map: ["light"]
      visible: false
  - type: BorgChassis
-    maxModules: 5
+    maxModules: 6
    moduleWhitelist:
      tags:
      - BorgModuleGeneric
@@ -42,7 +42,7 @@
      map: ["light"]
      visible: false
  - type: BorgChassis
-    maxModules: 3
+    maxModules: 4
    moduleWhitelist:
      tags:
      - BorgModuleGeneric
@@ -51,6 +51,25 @@
    noMindState: miner_e_r
  - type: Construction
    node: mining
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
+  - type: ContainerFill
+    containers:
+      borg_module:
+      - BorgModuleMining
+      - BorgModuleFireExtinguisher

 - type: entity
  id: BorgChassisEngineer
@@ -69,7 +88,7 @@
      map: ["light"]
      visible: false
  - type: BorgChassis
-    maxModules: 3
+    maxModules: 4
    moduleWhitelist:
      tags:
      - BorgModuleGeneric
@@ -78,6 +97,25 @@
    noMindState: engineer_e_r
  - type: Construction
    node: engineer
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Engineering"], ["Command"], ["Research"]]
+  - type: ContainerFill
+    containers:
+      borg_module:
+      - BorgModuleTool
+      - BorgModuleCable

 - type: entity
  id: BorgChassisJanitor
@@ -96,7 +134,7 @@
      map: ["light"]
      visible: false
  - type: BorgChassis
-    maxModules: 3
+    maxModules: 4
    moduleWhitelist:
      tags:
      - BorgModuleGeneric
@@ -105,6 +143,25 @@
    noMindState: janitor_e_r
  - type: Construction
    node: janitor
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: ContainerFill
+    containers:
+      borg_module:
+      - BorgModuleCleaning
+      - BorgModuleTrashCollection

 - type: entity
  id: BorgChassisMedical
@@ -123,7 +180,7 @@
      map: ["light"]
      visible: false
  - type: BorgChassis
-    maxModules: 3
+    maxModules: 4
    moduleWhitelist:
      tags:
      - BorgModuleGeneric
@@ -132,6 +189,24 @@
    noMindState: medical_e_r
  - type: Construction
    node: medical
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Medical
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Medical
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Medical"], ["Command"], ["Research"]]
+  - type: ContainerFill
+    containers:
+      borg_module:
+      - BorgModuleTreatment

 - type: entity
  id: BorgChassisService
@@ -150,7 +225,7 @@
      map: ["light"]
      visible: false
  - type: BorgChassis
-    maxModules: 3
+    maxModules: 4
    moduleWhitelist:
      tags:
      - BorgModuleGeneric
@@ -159,4 +234,21 @@
    noMindState: service_e_r
  - type: Construction
    node: service
-
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: ContainerFill
+    containers:
+      borg_module:
+      - BorgModuleService
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -152,6 +152,8 @@
    - Wrench
    - Screwdriver
    - Wirecutter
+    - Multitool
+    - Welder

 # cargo modules
 - type: entity
@@ -179,7 +181,9 @@
  - type: ItemBorgModule
    items:
    - MiningDrill
+    - Shovel
    - OreBag
+    - Crowbar

 - type: entity
  id: BorgModuleGrapplingGun
@@ -193,6 +197,7 @@
  - type: ItemBorgModule
    items:
    - WeaponGrapplingGun
+    - WeaponCrusherDagger

 # engineering modules
 - type: entity
@@ -222,6 +227,9 @@
  - type: ItemBorgModule
    items:
    - GasAnalyzer
+    - trayScanner
+    - Crowbar
+    - Wrench

 - type: entity
  id: BorgModuleConstruction
@@ -264,6 +272,8 @@
  - type: ItemBorgModule
    items:
    - LightReplacer
+    - Crowbar
+    - Screwdriver

 - type: entity
  id: BorgModuleCleaning
@@ -279,6 +289,7 @@
    - MopItem
    - Bucket
    - Holoprojector
+    - SprayBottleSpaceCleaner

 - type: entity
  id: BorgModuleTrashCollection
@@ -291,7 +302,7 @@
    - state: icon-trash-bag
  - type: ItemBorgModule
    items:
-    - TrashBag
+    - TrashBagBlue

 # medical modules
 - type: entity
@@ -324,6 +335,7 @@
    - Gauze10Lingering
    - Bloodpack10Lingering
    - Syringe
+    - Dropper

 - type: entity
  id: BorgModuleDefibrillator
@@ -385,9 +397,9 @@

 # service modules
 - type: entity
-  id: BorgModuleLiteracy
+  id: BorgModuleService
  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
-  name: literacy cyborg module
+  name: service cyborg module
  components:
  - type: Sprite
    layers:
@@ -397,6 +409,9 @@
    items:
    - Pen
    - BooksBag
+    - HandLabeler
+    - Lighter
+    - DrinkShaker

 - type: entity
  id: BorgModuleMusique
@@ -410,6 +425,8 @@
  - type: ItemBorgModule
    items:
    - SynthesizerInstrument
+    - ElectricGuitarInstrument
+    - SaxophoneInstrument

 - type: entity
  id: BorgModuleGardening
@@ -455,3 +472,4 @@
    items:
    - BikeHorn
    - ClownRecorder
+    - BikeHornInstrument
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -463,7 +463,7 @@
    - BorgModuleGardening
    - BorgModuleHarvesting
    - BorgModuleMusique
-    - BorgModuleLiteracy
+    - BorgModuleService
    - BorgModuleClowning
    - BorgModuleDiagnosis
    - BorgModuleTreatment
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -323,8 +323,8 @@
  result: BorgModuleCable
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -333,8 +333,8 @@
  result: BorgModuleFireExtinguisher
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -343,8 +343,8 @@
  result: BorgModuleGPS
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -353,8 +353,8 @@
  result: BorgModuleRadiationDetection
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -363,8 +363,8 @@
  result: BorgModuleTool
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -373,8 +373,8 @@
  result: BorgModuleAppraisal
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -383,8 +383,8 @@
  result: BorgModuleMining
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -394,7 +394,7 @@
  completetime: 3
  materials:
    Steel: 500
-    Glass: 750
+    Glass: 500
    Plastic: 250
    Gold: 50

@@ -404,7 +404,7 @@
  completetime: 3
  materials:
    Steel: 500
-    Glass: 750
+    Glass: 500
    Plastic: 250
    Gold: 50

@@ -414,7 +414,7 @@
  completetime: 3
  materials:
    Steel: 500
-    Glass: 750
+    Glass: 500
    Plastic: 250
    Gold: 50

@@ -423,8 +423,8 @@
  result: BorgModuleGasAnalyzer
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -434,7 +434,7 @@
  completetime: 3
  materials:
    Steel: 500
-    Glass: 750
+    Glass: 500
    Plastic: 250
    Gold: 50

@@ -443,8 +443,8 @@
  result: BorgModuleLightReplacer
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -453,8 +453,8 @@
  result: BorgModuleCleaning
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -463,8 +463,8 @@
  result: BorgModuleTrashCollection
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -473,8 +473,8 @@
  result: BorgModuleDiagnosis
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -483,8 +483,8 @@
  result: BorgModuleTreatment
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -494,7 +494,7 @@
  completetime: 3
  materials:
    Steel: 500
-    Glass: 750
+    Glass: 500
    Plastic: 250
    Gold: 50

@@ -504,7 +504,7 @@
  completetime: 3
  materials:
    Steel: 500
-    Glass: 750
+    Glass: 500
    Plastic: 250
    Gold: 50

@@ -513,8 +513,8 @@
  result: BorgModuleArtifact
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -523,18 +523,18 @@
  result: BorgModuleAnomaly
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

 - type: latheRecipe
-  id: BorgModuleLiteracy
-  result: BorgModuleLiteracy
+  id: BorgModuleService
+  result: BorgModuleService
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -543,8 +543,8 @@
  result: BorgModuleMusique
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -553,8 +553,8 @@
  result: BorgModuleGardening
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -563,8 +563,8 @@
  result: BorgModuleHarvesting
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50

@@ -573,7 +573,7 @@
  result: BorgModuleClowning
  completetime: 3
  materials:
-    Steel: 500
-    Glass: 750
+    Steel: 250
+    Glass: 250
    Plastic: 250
    Gold: 50
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -110,7 +110,7 @@
    - ComputerTelevisionCircuitboard
    - SynthesizerInstrument
    - BorgModuleMusique
-    - BorgModuleLiteracy
+    - BorgModuleService
    - BorgModuleClowning
    - DawInstrumentMachineCircuitboard
    - MassMediaCircuitboard