Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff

Resources/Changelog/Changelog.yml

@@ -5091,3 +5091,18 @@ Entries:
       message: Stacks of spesos now display the largest valued bill on top.
   id: 5041
   time: '2024-06-14T23:17:33.0000000+00:00'
+- author: UncaughtEx
+  changes:
+    - type: Add
+      message: >-
+        With permission from the NT Pharmaceuticals branch, fresh from the Fabs,
+        SBI would like to introduce the Beaker Shipyard License approved for
+        distribution! Yeah, Science!
+  id: 5042
+  time: '2024-06-15T02:40:48.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: Fixed backrooms on salvage outpost dungeon theme.
+  id: 5043
+  time: '2024-06-15T18:29:25.0000000+00:00'

Resources/Locale/en-US/_NF/guidebook/guides.ftl

@@ -12,3 +12,4 @@ guide-entry-shipyard-legman = Legman
 guide-entry-shipyard-liquidator = Liquidator
 guide-entry-shipyard-pioneer = Pioneer
 guide-entry-shipyard-searchlight = Searchlight
+guide-entry-shipyard-spirit = Spirit

Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml

@@ -29,7 +29,6 @@
                 SheetSteel1:
                   min: 2
                   max: 4
-    - type: MobState # Frontier (otherwise NPCs won't attack the entity)
 
 - type: entity
   parent: BaseStructure
@@ -119,6 +118,7 @@
     - type: NoRotateOnMove
     - type: Input
       context: "human"
+    - type: MobState # Frontier (otherwise NPCs won't attack the entity)
 
 - type: entity
   parent: BaseWeaponTurret

Resources/Prototypes/_NF/Entities/Objects/Misc/traking_dart.yml

@@ -41,7 +41,7 @@
       projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+          bounds: "-0.2,-0.2,0.2,0.2"
         hard: false
         mask:
         - Impassable

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -106,7 +106,6 @@
     quickEquip: false
     slots:
     - Back
-    - Belt
     - suitStorage
   - type: BallisticAmmoProvider
     proto: null

Resources/Prototypes/_NF/Guidebook/shipyard.yml

@@ -14,6 +14,7 @@
   - ShipyardLiquidator
   - ShipyardPioneer
   - ShipyardSearchlight
+  - ShipyardSpirit
 
 - type: guideEntry
   id: ShipyardAmbition
@@ -69,3 +70,8 @@
   id: ShipyardSearchlight
   name: guide-entry-shipyard-searchlight
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml"
+
+- type: guideEntry
+  id: ShipyardSpirit
+  name: guide-entry-shipyard-spirit
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml"

Resources/Prototypes/_NF/Shipyard/beaker.yml

@@ -0,0 +1,29 @@
+- type: vessel
+  id: Beaker
+  name: SBI Beaker
+  description: "A fully functional Chemistry Lab. Perfect for the prospecting chemist or high school chemistry teachers. Yeah, Science!"
+  price: 65000
+  category: Small
+  group: Civilian
+  shuttlePath: /Maps/_NF/Shuttles/beaker.yml
+
+- type: gameMap
+  id: Beaker
+  mapName: 'SBI Beaker'
+  mapPath: /Maps/_NF/Shuttles/beaker.yml
+  minPlayers: 0
+  stations:
+    Beaker:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Beaker {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]

Resources/Prototypes/_NF/Shipyard/spirit.yml

@@ -0,0 +1,39 @@
+# Author Info
+# GitHub: Actualcatmoment (https://github.com/Actualcatmoment)
+# Discord: @iNoahGuy
+
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
+
+# Shuttle Notes:
+#
+- type: vessel
+  id: Spirit
+  name: NM Spirit
+  description: A tiny medical search and rescue shuttle, as nimble as it is cramped. Running costs guarenteed* to be 5% lower than competing models!
+  price: 15500
+  category: Small
+  group: Civilian
+  shuttlePath: /Maps/_NF/Shuttles/spirit.yml
+
+- type: gameMap
+  id: Spirit
+  mapName: 'NM Spirit'
+  mapPath: /Maps/_NF/Shuttles/spirit.yml
+  minPlayers: 0
+  stations: 
+    Spirit:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Spirit {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]

Resources/ServerInfo/_NF/Guidebook/Shipyard/Spirit.xml

@@ -0,0 +1,103 @@
+<Document>
+  # SPIRIT-CLASS SEARCH AND RESCUE SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="ComputerCrewMonitoring"/>
+  <GuideEntityEmbed Entity="HandheldHealthAnalyzer"/>
+  <GuideEntityEmbed Entity="RollerBed"/>
+  <GuideEntityEmbed Entity="BodyBag"/>
+  </Box>  
+    [color=#a4885c]Ship Size:[/color] Small (micro)
+
+	[color=#a4885c]Recommended Crew:[/color] 1
+
+	[color=#a4885c]Power Gen Type:[/color] Plasma
+
+	[color=#a4885c]Expeditions:[/color] None
+
+	[color=#a4885c]IFF Console:[/color] None
+
+	[color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary
+
+  "An absolutely tiny shuttle designed for rapid response search and rescue operations on a budget."
+
+  # Piloting
+  <Box>
+    <GuideEntityEmbed Entity="ComputerShuttle"/>
+  </Box>
+  After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
+
+  - First, disconnect any airlocks that are connected to the dock.
+  - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
+
+  # Hiring crew
+  <Box>
+    <GuideEntityEmbed Entity="ComputerStationRecords"/>
+    <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
+    <GuideEntityEmbed Entity="IntercomCommon"/>
+  </Box>
+  As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew.
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationWallBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+
+    - Check if the APC unit's Main Breaker is toggled on.
+    - Check the APC unit's current Load* (W).
+
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+
+  - Check if the P.A.C.M.A.N. generator unit is anchored to the floor.
+  - Check if the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check if the P.A.C.M.A.N. generator unit is set to HV output.
+  - Set Target Power for 8** [bold]k[/bold]W.
+  - Start the P.A.C.M.A.N. generator unit.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  </Box>
+
+  - Check if the air canister is anchored to connector port.
+  - Check if the distribution pump is set to normal pressure (101kPa).
+  - Enable the distribution pump.
+
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+
+  - Enable waste loop pump.
+  - Disable Auto Mode on the Air Alarm in the Engine Room.
+  - Set the Air Alarm in the Engine Room to Filtering (Wide).
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check if the gyroscope is anchored, powered, and enabled.
+  - Check if the mini gravity generator is anchored, powered, and enabled.
+
+  ## Sidenotes
+
+  * - Spirit-class SAR ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption (which for the unmodified ship is 7.7 kW). One can check the ship's total power consumption against the P.A.C.M.A.N. generator target power output: to keep substation and APC fully charged,  the P.A.C.M.A.N. generator target power should exceed APC's Load. Remember to check the APC Load and adjust the generator unit's target power after connecting new power-consuming machines.
+
+  ** - Spirit-class S.A.R. ships have low power demand. A standard P.A.C.M.A.N. generator's target power value can be set to 8 kW. Due to the low mass of the shuttle less power is needed to maintain inertial dampening and the artificial gravity field, 8kW is sufficient even when the gravity generator is spooling.
+
+</Document>

Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/nfsd_lake.rsi/meta.json

@@ -28,6 +28,14 @@
 		{
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }