Caduceus as mothership (#823)

* Did the deed * Fix spectre's name tag * Removed the None ui key * Typo * Limit the empress' console to just 3 ships * Cleanup * Add a custom shipyard console to the caduceus * Unmail your mail * Medical Shipyard RSI --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Jan 14, 2024 · b85cb9f · b85cb9f
1 parent cf47a2c
commit b85cb9f
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 39 deletions.
diff --git a/Resources/Maps/Shuttles/caduceus.yml b/Resources/Maps/Shuttles/caduceus.yml
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
@@ -20,3 +20,25 @@
     - Fighter
     - Cleric
     - Rogue
+
+# The caduceus console
+- type: entity
+  id: CaduceusMothershipComputer
+  name: Caduceus mothership console
+  parent: BaseMothershipComputer
+  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:
+    - Pulse
+    - Searchlight
diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml
@@ -1,5 +1,5 @@
 - type: vessel
-  id: searchlight
+  id: Searchlight
   name: NM Searchlight
   description: A small vessel outfitted for the search and recovery of wounded NT personnel. Primarily for recovery. Search though? Well. You got that medical tracker implanted, right?
   price: 29500
@@ -8,12 +8,12 @@
   shuttlePath: /Maps/Shuttles/searchlight.yml
 
 - type: gameMap
-  id: searchlight
+  id: Searchlight
   mapName: 'NM Searchlight'
   mapPath: /Maps/Shuttles/searchlight.yml
   minPlayers: 0
   stations:
-    searchlight:
+    Searchlight:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup

diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/computer_medical.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/computer_medical.png
diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "shipyard_security and shipyard made by Potato1234_x, black market versions by terezi4real on github",
+  "copyright": "shipyard_security and shipyard made by Potato1234_x, black market versions by terezi4real on github, medical versions by sungyandy",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,10 @@
       "name": "computer_blackmarket",
       "directions": 4
     },
+    {
+      "name": "computer_medical",
+      "directions": 4
+    },
     {
       "name": "generic_keyboard",
       "directions": 4
@@ -113,6 +117,36 @@
         ]
       ]
     },
+    {
+      "name": "shipyard_medical",
+      "directions": 4,
+      "delays": [
+        [
+          1.0,
+          0.3,
+          1.0,
+          0.3
+        ],
+        [
+          1.0,
+          0.3,
+          1.0,
+          0.3
+        ],
+        [
+          1.0,
+          0.3,
+          1.0,
+          0.3
+        ],
+        [
+          1.0,
+          0.3,
+          1.0,
+          0.3
+        ]
+      ]
+    },
     {
       "name": "telesci_key",
       "directions": 4

diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_medical.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_medical.png