From cbfb226b4b857e6ec9e24be00d92b2534a8ba1b4 Mon Sep 17 00:00:00 2001
From: Flipp Syder <76629141+vulppine@users.noreply.github.com>
Date: Tue, 31 May 2022 04:02:44 -0700
Subject: [PATCH] Makes camera monitors/the television constructable (#8542)

---
 .../Catalog/Research/technologies.yml         |  3 +++
 .../Circuitboards/Machine/production.yml      |  4 +--
 .../Devices/Circuitboards/computer.yml        |  9 +++++++
 .../Machines/Computers/computers.yml          |  2 ++
 .../Entities/Structures/Machines/lathe.yml    |  6 +++++
 .../Prototypes/Recipes/Lathes/electronics.yml | 27 +++++++++++++++++++
 6 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 5686d9ac5a..0d3415e9fd 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -281,6 +281,9 @@
     - SurveillanceCameraWirelessRouterCircuitboard
     - SurveillanceWirelessCameraMovableCircuitboard
     - SurveillanceWirelessCameraAnchoredCircuitboard
+    - SurveillanceCameraMonitorCircuitboard
+    - SurveillanceWirelessCameraMonitorCircuitboard
+    - ComputerTelevisionCircuitboard
     - AirAlarmElectronics
     - FireAlarmElectronics
 
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 080adc6158..8474c4b30f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -400,7 +400,7 @@
 - type: entity
   id: SurveillanceCameraRouterCircuitboard
   parent: BaseMachineCircuitboard
-  name: Surveillance camera router board
+  name: surveillance camera router board
   description: A machine printed circuit board for a surveillance camera router
   components:
     - type: MachineBoard
@@ -411,7 +411,7 @@
 - type: entity
   id: SurveillanceCameraWirelessRouterCircuitboard
   parent: BaseMachineCircuitboard
-  name: Surveillance camera wireless router board
+  name: surveillance camera wireless router board
   description: A machine printed circuit board for a surveillance camera wireless router
   components:
     - type: MachineBoard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 3e0bbe1a51..65d62f1488 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -84,6 +84,15 @@
     - type: ComputerBoard
       prototype: ComputerSurveillanceWirelessCameraMonitor
 
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: ComputerTelevisionCircuitboard
+  name: television board
+  description: A computer printed circuit board for a television
+  components:
+    - type: ComputerBoard
+      prototype: ComputerTelevision
+
 - type: entity
   parent: BaseComputerCircuitboard
   id: PowerMonitoringComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 9fd85533b2..974237fabc 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -469,6 +469,8 @@
           body: television
           bodyBroken: television_broken
           screen: detective_television
+    - type: Computer
+      board: ComputerTelevisionCircuitboard
     - type: Sprite
       sprite: Structures/Machines/computers.rsi
       layers:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 22ca132d5e..9345426364 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -251,6 +251,12 @@
       - ChemMasterMachineCircuitboard
       - ChemDispenserMachineCircuitboard
       - SurveillanceCameraRouterCircuitboard
+      - SurveillanceCameraMonitorCircuitboard
+      - SurveillanceWirelessCameraMonitorCircuitboard
+      - SurveillanceCameraWirelessRouterCircuitboard
+      - ComputerTelevisionCircuitboard
+      - SurveillanceWirelessCameraMovableCircuitboard
+      - SurveillanceWirelessCameraAnchoredCircuitboard
       - HydroponicsTrayMachineCircuitboard
       - SolarControlComputerCircuitboard
       - AutolatheMachineCircuitboard
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index ccf63eeb62..00fc668b41 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -330,3 +330,30 @@
   materials:
     Steel: 100
     Glass: 900
+
+- type: latheRecipe
+  id: SurveillanceCameraMonitorCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: SurveillanceCameraMonitorCircuitboard
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 900
+
+- type: latheRecipe
+  id: SurveillanceWirelessCameraMonitorCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: SurveillanceWirelessCameraMonitorCircuitboard
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 900
+
+- type: latheRecipe
+  id: ComputerTelevisionCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: ComputerTelevisionCircuitboard
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 900