Fixing

new-frontiers-14 · Apr 25, 2024 · c137b0c · c137b0c
1 parent 841e2de
commit c137b0c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 5 deletions.
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
@@ -852,7 +852,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,4.5
       parent: 2
-- proto: ComputerTabletopShuttleSyndie
+- proto: ComputerTabletopShuttleAntag
   entities:
   - uid: 75
     components:
@@ -1522,19 +1522,26 @@ entities:
         - Pressed: Toggle
         56:
         - Pressed: Toggle
-- proto: SpawnPointLatejoin
+- proto: SpawnPointPirate
   entities:
   - uid: 235
     components:
     - type: Transform
-      pos: -0.5,4.5
+      pos: -4.5,4.5
       parent: 2
-- proto: SpawnPointPirate
+- proto: SpawnPointPirateCaptain
   entities:
   - uid: 245
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: -3.5,4.5
+      parent: 2
+- proto: SpawnPointPirateFirstMate
+  entities:
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -2.5,4.5
       parent: 2
 - proto: SubstationBasic
   entities:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -22,6 +22,7 @@
   id: ComputerEmergencyShuttle
   name: emergency shuttle console
   description: Handles authorization to early launch the shuttle.
+  noSpawn: true # Frontier
   components:
   - type: AccessReader
     access:
@@ -104,6 +105,7 @@
   id: ComputerShuttleSyndie
   name: syndicate shuttle console
   description: Used to pilot a syndicate shuttle.
+  noSpawn: true # Frontier
   components:
   - type: Sprite
     layers:
@@ -134,6 +136,7 @@
   id: ComputerShuttleCargo
   name: cargo shuttle console
   description: Used to pilot the cargo shuttle.
+  noSpawn: true # Frontier
   components:
   - type: Sprite
     layers:
@@ -164,6 +167,7 @@
   id: ComputerShuttleSalvage
   name: salvage shuttle console
   description: Used to pilot the salvage shuttle.
+  noSpawn: true # Frontier
   components:
     - type: Sprite
       layers:
@@ -714,6 +718,7 @@
   parent: BaseComputer
   name: cargo shuttle computer
   description: Used to order the shuttle.
+  noSpawn: true # Frontier
   components:
   - type: Sprite
     layers:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml
@@ -149,3 +149,22 @@
       interfaces:
         - key: enum.ContrabandPalletConsoleUiKey.Contraband
           type: ContrabandPalletConsoleBoundUserInterface
+
+- type: entity
+  parent: ComputerShuttle
+  id: ComputerShuttleAntag
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: syndishuttle
+    - map: ["computerLayerKeys"]
+      state: syndie_key
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#c94242"
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
@@ -63,6 +63,27 @@
 - type: entity
   parent: [BaseStructureComputerTabletop, ComputerShuttleSyndie] # Shuttle
   id: ComputerTabletopShuttleSyndie
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: SmallObjects
+    layers:
+    - map: ["computerLayerBody"]
+      sprite: _NF/Structures/Machines/computer_tabletop.rsi
+      state: computer_tabletop
+    - map: ["computerLayerKeyboard"]
+      sprite: _NF/Structures/Machines/computer_tabletop.rsi
+      state: generic_keyboard_tabletop
+    - map: ["computerLayerScreen"]
+      sprite: Structures/Machines/computers.rsi
+      state: syndishuttle
+    - map: ["computerLayerKeys"]
+      sprite: Structures/Machines/computers.rsi
+      state: syndie_key
+
+- type: entity
+  parent: [BaseStructureComputerTabletop, ComputerShuttleAntag] # Shuttle
+  id: ComputerTabletopShuttleAntag
   components:
   - type: Sprite
     drawdepth: SmallObjects