Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

…-station-14 into Workflows2-test

Resources/Changelog/Frontier.yml

@@ -4538,3 +4538,23 @@ Entries:
       message: Resprited departmental EVA suits.
   id: 5399
   time: '2024-10-14T09:56:55.0000000+00:00'
+- author: Myzumi
+  changes:
+    - type: Add
+      message: New Cyborg Modules, Advanced Mining and Advanced Paramedic
+    - type: Add
+      message: Cyborg Tool modules now have a Maintenance Jack
+  id: 5400
+  time: '2024-10-14T22:16:49.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Added the Wendigo light medium interdictor!
+  id: 5401
+  time: '2024-10-14T22:21:01.0000000+00:00'
+- author: arimah
+  changes:
+    - type: Remove
+      message: The NSF Marauder is no longer available for purchase.
+  id: 5402
+  time: '2024-10-14T22:35:31.0000000+00:00'

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -178,6 +178,7 @@
     - Wirecutter
     - Multitool
     - WelderIndustrial
+    - MaintenanceJack # Frontier
 
 # cargo modules
 - type: entity
@@ -243,6 +244,7 @@
     - RemoteSignaller
     - GasAnalyzer
     - GeigerCounter
+    - MaintenanceJack # Frontier
 
 - type: entity
   id: BorgModuleConstruction

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -706,6 +706,8 @@
     - BorgModuleDiagnosis
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
+    - BorgModuleAdvancedParamedic # Frontier
+    - BorgModuleAdvancedMining # Frontier
     - RipleyHarness
     - RipleyLArm
     - RipleyRArm

Resources/Prototypes/Research/civilianservices.yml

@@ -164,6 +164,7 @@
   recipeUnlocks:
   - BorgModuleAdvancedTreatment
   - BorgModuleDefibrillator
+  - BorgModuleAdvancedParamedic # Frontier
 
 - type: technology
   id: AdvancedCleaning

Resources/Prototypes/Research/industrial.yml

@@ -193,6 +193,7 @@
     - NFBlueprintOreBagOfHolding # Frontier
     - NFBlueprintMiningDrillDiamond # Frontier
     - NFBlueprintAdvancedMineralScannerEmpty # Frontier
+    - BorgModuleAdvancedMining # Frontier
 
 # Tier 3
 

Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml

@@ -0,0 +1,17 @@
+- type: entity
+  id: Suture10Lingering
+  parent: MedicatedSuture
+  suffix: 10, Lingering
+  components:
+  - type: Stack
+    lingering: true
+    count: 10
+
+- type: entity
+  id: Mesh10Lingering
+  parent: RegenerativeMesh
+  suffix: 10, Lingering
+  components:
+  - type: Stack
+    lingering: true
+    count: 10

Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -0,0 +1,37 @@
+- type: entity
+  id: BorgModuleAdvancedMining
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: advanced mining cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-advancedmining
+      sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
+  - type: ItemBorgModule
+    items:
+    - MiningDrillDiamond
+    - Shovel
+    - AdvancedMineralScannerUnpowered
+    - OreBagOfHolding
+    - JawsOfLife
+    - RadioHandheldNF
+
+- type: entity
+  id: BorgModuleAdvancedParamedic
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: advanced paramedic cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-paramedic
+      sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
+  - type: ItemBorgModule
+    items:
+    - HandheldHealthAnalyzerUnpowered
+    - Suture10Lingering
+    - Mesh10Lingering
+    - Gauze10Lingering
+    - Bloodpack10Lingering
+    - SyringeBluespace

Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml

@@ -0,0 +1,23 @@
+- type: latheRecipe
+  id: BorgModuleAdvancedParamedic
+  result: BorgModuleAdvancedParamedic
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50
+    Bluespace: 60 # SyringeBluespace Bluepsace price
+
+- type: latheRecipe
+  id: BorgModuleAdvancedMining
+  result: BorgModuleAdvancedMining
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Bluespace: 200 # OreBagOfHolding Bluepsace price
+    Diamond: 100 # MiningDrillDiamond Diamond price

Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml

@@ -0,0 +1,36 @@
+# Author Info
+# GitHub: MagnusCrowe
+# Discord: MagnusCrowe
+
+# Maintainer Info
+# GitHub: MagnusCrowe
+# Discord: MagnusCrowe
+
+# Shuttle Notes:
+#
+- type: vessel
+  id: Wendigo
+  name: NSF Wendigo
+  description: A light medium ship with a recommended crew of 2 to 3 officers, the Wendigo is a dedicated interdiction vessel outfitted with a powerful EMP device for tackling escaping vessels.
+  price: 34500
+  category: Medium
+  group: Security
+  access: Sergeant
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml
+
+- type: gameMap
+  id: Wendigo
+  mapName: 'NSF Wendigo'
+  mapPath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml
+  minPlayers: 0
+  stations:
+    Wendigo:
+      stationProto: StandardFrontierSecurityVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Wendigo {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs: {}

Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Made by GhostPrince for Frontier Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon-advancedmining"
+        },
+        {
+            "name": "icon-paramedic"
+        }
+    ]
+}