Mother Of Ship

new-frontiers-14 · Mar 24, 2024 · c987d41 · c987d41
1 parent 72a8d81
commit c987d41
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 28 deletions.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml
@@ -73,21 +73,6 @@
     containers:
       ShipyardConsole-targetId: !type:ContainerSlot {}
 
-# Custom console
-- type: entity
-  id: BaseMothershipComputer
-  parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyard]
-  name: mothership console
-  description: Used on motherships to purchase and sell ships without returning to a station.
-  components:
-  - type: ActivatableUI
-    key: enum.ShipyardConsoleUiKey.Custom
-  - type: UserInterface
-    interfaces:
-    - key: enum.ShipyardConsoleUiKey.Custom
-      type: ShipyardConsoleBoundUserInterface
-  - type: ShipyardListing
-
 # Hardcoded consoles
 - type: entity
   id: ComputerShipyardSecurity

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
@@ -1,8 +1,24 @@
+# Custom console
+- type: entity
+  id: BaseMothershipComputer
+  parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyard]
+  suffix: Mothership
+  description: Used on motherships to purchase and sell ships without returning to a station.
+  abstract: true
+  components:
+  - type: ActivatableUI
+    key: enum.ShipyardConsoleUiKey.Custom
+  - type: UserInterface
+    interfaces:
+    - key: enum.ShipyardConsoleUiKey.Custom
+      type: ShipyardConsoleBoundUserInterface
+  - type: ShipyardListing
+
 # The empress console
 - type: entity
   id: EmpressMothershipComputer
-  name: Empress mothership console
   parent: BaseMothershipComputer
+  name: empress shipyard console
   components:
   - type: Sprite
     sprite: _NF/Structures/Machines/computers.rsi
@@ -24,8 +40,8 @@
 # The mccargo console
 - type: entity
   id: McCargoMothershipComputer
-  name: McCargo delivery ship console
   parent: BaseMothershipComputer
+  name: mccargo shipyard console
   components:
   - type: ShipyardListing
     shuttles:
@@ -34,8 +50,8 @@
 # The caduceus console
 - type: entity
   id: CaduceusMothershipComputer
-  name: Caduceus mothership console
   parent: BaseMothershipComputer
+  name: caduceus shipyard console
   components:
   - type: Sprite
     sprite: _NF/Structures/Machines/computers.rsi
@@ -53,11 +69,32 @@
     - Pulse
     - Searchlight
 
+# The caduceus console
+- type: entity
+  id: TriageMothershipComputer
+  parent: BaseMothershipComputer
+  name: triage shipyard console
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Machines/computers.rsi
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer_medical
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: shipyard_medical
+    - map: ["computerLayerKeys"]
+      state: telesci_key
+  - type: ShipyardListing
+    shuttles:
+    - Shambulance
+
 # The GASBENDA-A-A-AH (sick metal guitar riff) console
 - type: entity
   id: GasbenderMothershipComputer
-  name: Gasbender mothership ship console
   parent: BaseMothershipComputer
+  name: gasbender shipyard console
   components:
   - type: ShipyardListing
     shuttles:
@@ -68,8 +105,8 @@
 # The crescent console
 - type: entity
   id: CrescentMothershipComputer
-  name: Crescent mothership console
   parent: BaseMothershipComputer
+  name: crescent shipyard console
   components:
   - type: ShipyardListing
     shuttles:

diff --git a/Resources/Prototypes/_NF/Shipyard/shambulance.yml b/Resources/Prototypes/_NF/Shipyard/shambulance.yml
@@ -13,8 +13,8 @@
   name: MV Shambulance
   description: MISSING.
   price: 1000 # Temp price
-  category: Large
-  group: Civilian
+  category: Small
+  group: None
   shuttlePath: /Maps/_NF/Shuttles/shambulance.yml
 
 - type: gameMap
@@ -33,8 +33,4 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs:
-#            Paramedic: [ 0, 0 ]
-#            ChiefMedicalOfficer: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-#            Chemist: [ 0, 0 ]
+          availableJobs: {}
diff --git a/Resources/Prototypes/_NF/Shipyard/triage.yml b/Resources/Prototypes/_NF/Shipyard/triage.yml
@@ -13,7 +13,7 @@
   name: MV Triage
   description: MISSING.
   price: 1000 # Temp price
-  category: Small
+  category: Large
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/triage.yml