only took 99 years

cosmatic-drift-14 · Jan 13, 2025 · 70f7878 · 70f7878
1 parent 0253cc3
commit 70f7878
Show file tree

Hide file tree

Showing 7 changed files with 1,448 additions and 4 deletions.
diff --git a/Resources/Maps/_CD/Shuttles/mining.yml b/Resources/Maps/_CD/Shuttles/mining.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -22,6 +22,7 @@
     - id: BookSOPCargo
     - id: BookSOPCommand
       prob: 0.3
+    - id: SalvageShuttleConsoleCircuitboard
 
 - type: entity
   id: LockerQuarterMasterFilled

diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
@@ -52,6 +52,9 @@
             - type: TradeStation
           paths:
             - /Maps/Shuttles/trading_outpost.yml
+        mining: !type:GridSpawnGroup
+          paths:
+          - /Maps/_CD/Shuttles/mining.yml
         # Spawn last
         ruins: !type:GridSpawnGroup
           hide: true

diff --git a/Resources/Prototypes/_CD/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/_CD/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -8,3 +8,12 @@
       state: cpu_command
     - type: ComputerBoard
       prototype: ComputerJobSlots
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: SalvageShuttleConsoleCircuitboard
+  name: salvage shuttle console board
+  description: A computer printed circuit board for a salvage shuttle console.
+  components:
+  - type: ComputerBoard
+    prototype: ComputerShuttleSalvage
diff --git a/Resources/Prototypes/_CD/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_CD/Entities/Structures/Machines/Computers/computers.yml
@@ -46,3 +46,31 @@
         type: JobSlotsConsoleBoundUserInterface
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
+
+- type: entity
+  parent: BaseComputerShuttle
+  id: ComputerShuttleSalvage
+  name: salvage shuttle console
+  description: Used to pilot the salvage shuttle.
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "computerLayerBody" ]
+      state: computer
+    - map: [ "computerLayerKeyboard" ]
+      state: generic_keyboard
+    - map: [ "computerLayerScreen" ]
+      state: shuttle
+    - map: [ "computerLayerKeys" ]
+      state: generic_keys
+  - type: DroneConsole
+    components:
+    - type: SalvageShuttle
+  - type: RadarConsole
+    maxRange: 256
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#43CCB5"
+  - type: Computer
+    board: SalvageShuttleConsoleCircuitboard
diff --git a/Resources/Prototypes/_CD/Entities/Structures/Machines/Computers/tabletopcomputer.yml b/Resources/Prototypes/_CD/Entities/Structures/Machines/Computers/tabletopcomputer.yml
@@ -559,6 +559,27 @@
       sprite: Structures/Machines/computers.rsi
       state: generic_keys
 
+# Salvage Shuttle Computer
+- type: entity
+  parent: [ BaseStructureComputerTabletop, ComputerShuttleSalvage ]
+  id: ComputerTabletopShuttleSalvage
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "computerLayerBody" ]
+      sprite: _CD/Structures/Machines/Computers/tabletopcomputer.rsi
+      state: computer_tabletop
+    - map: [ "computerLayerKeyboard" ]
+      sprite: _CD/Structures/Machines/Computers/tabletopcomputer.rsi
+      state: generic_keyboard_tabletop
+    - map: [ "computerLayerScreen" ]
+      sprite: Structures/Machines/computers.rsi
+      state: shuttle
+    - map: [ "computerLayerKeys" ]
+      sprite: Structures/Machines/computers.rsi
+      state: generic_keys
+
 # IFF Console
 - type: entity
   parent: [ BaseStructureComputerTabletop, ComputerIFF ]

diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -385,10 +385,10 @@ ClothingBeltSuspenders: ClothingBeltSuspendersRed
 # 2024-08-19
 ClothingNeckShockCollar: ClothingBackpackElectropack
 
-# 2024-08-22
-ComputerShuttleSalvage: null
-SalvageShuttleConsoleCircuitboard: null
-SalvageShuttleCircuitboardStealObjective: null
+# 2024-08-22 # CD - Reverted
+#ComputerShuttleSalvage: null
+#SalvageShuttleConsoleCircuitboard: null
+#SalvageShuttleCircuitboardStealObjective: null
 
 # 2024-08-28
 ClothingBackpackDuffelSyndicateCostumeCentcom: null