Merge branch 'new-frontiers-14:master' into SVT40

Content.Shared/Movement/Systems/SharedMoverController.cs

@@ -440,9 +440,20 @@ private bool TryGetSound(
                 sound = moverModifier.FootstepSoundCollection;
                 return true;
             }
-
+
+            // Frontier: check outer clothes
+            // If you have a hardsuit or power armor on that goes around your boots, it's the hardsuit that hits the floor.
+            // Check should happen before NoShoesSilentFootsteps check - loud power armor should count as wearing shoes.
+            if (_inventory.TryGetSlotEntity(uid, "outerClothing", out var outerClothing) &&
+                TryComp<FootstepModifierComponent>(outerClothing, out var outerModifier))
+            {
+                sound = outerModifier.FootstepSoundCollection;
+                return true;
+            }
+            // End Frontier
+
             // If got the component in yml and no shoes = no sound. Delta V
-            if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) &
+            if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) &&
                 !_inventory.TryGetSlotEntity(uid, "shoes", out var _))
             {
                 return false;

Resources/Changelog/Changelog.yml

@@ -5166,3 +5166,21 @@ Entries:
       message: Cryo pods now only extract cryogenic medicines from beakers.
   id: 5050
   time: '2024-06-21T17:02:34.0000000+00:00'
+- author: Actualcatmoment
+  changes:
+    - type: Add
+      message: Added hiring, piloting, expedition entries to the Guidebook.
+    - type: Tweak
+      message: All Frontier-specific Guidebook entries have been rewritten.
+  id: 5051
+  time: '2024-06-24T06:09:00.0000000+00:00'
+- author: Iocanthos and whatston3
+  changes:
+    - type: Add
+      message: Coffee seeds are now available for planting.
+    - type: Add
+      message: >-
+        Coffee beans can be removed from fruit, roasted, ground and added to hot
+        water to make coffee.
+  id: 5052
+  time: '2024-06-24T06:13:34.0000000+00:00'

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

@@ -1,6 +1,24 @@
+# Base entries
 guide-entry-nf14 = New Frontier
 guide-entry-bank = NT Galactic Bank
+guide-entry-piloting = Piloting
+guide-entry-hiring = Hiring Crew
+guide-entry-expeditions = Expeditions
 guide-entry-shipyard = Shipyard
+
+# Expedition faction entries
+guide-entry-expedition-faction-carp = Carp
+guide-entry-expedition-faction-cultists = Cultists
+guide-entry-expedition-faction-dinosaurs = Dinosaurs
+guide-entry-expedition-faction-explorers = Explorers
+guide-entry-expedition-faction-flesh = Flesh
+guide-entry-expedition-faction-gangers = Gangers
+guide-entry-expedition-faction-mercenaries = Mercenaries
+guide-entry-expedition-faction-silicons = Silicons
+guide-entry-expedition-faction-syndicate = Syndicate
+guide-entry-expedition-faction-xenos = Xenos
+
+# Shipyard entries
 guide-entry-shipyard-ambition = Ambition
 guide-entry-shipyard-brigand = Brigand
 guide-entry-shipyard-ceres = Ceres
@@ -12,4 +30,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
+guide-entry-shipyard-spirit = Spirit

Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl

@@ -0,0 +1,2 @@
+reagent-name-coffeegrounds = coffee grounds
+reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew.

Resources/Locale/en-US/_NF/seeds/seeds.ftl

@@ -3,3 +3,5 @@ seeds-spesos-name = spesos
 seeds-spesos-display-name = spesos
 seeds-pear-name = pear
 seeds-pear-display-name = pear
+seeds-coffee-name = coffee
+seeds-coffee-display-name = coffee plant

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -38,5 +38,6 @@
     BerrySeeds: 5
     PeaSeeds: 5
     CottonSeeds: 5
+    CoffeeSeeds: 5 # Frontier
   emaggedInventory:
     FlyAmanitaSeeds: 1

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml

@@ -49,6 +49,7 @@
       - FoodPeaPod
       - FoodPumpkin
       - CottonBol
+      - FoodCoffee # Frontier
     chance: 0.8
     offset: 0.0
     #rare

Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -19,3 +19,14 @@
       seedId: pear
     - type: Sprite
       sprite: _NF/Objects/Specific/Hydroponics/pear.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of coffee seeds
+  description: Perfect for any self-respecting coffee roaster.
+  id: CoffeeSeeds
+  components:
+    - type: Seed
+      seedId: coffee
+    - type: Sprite
+      sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi

Resources/Prototypes/_NF/Guidebook/bank.yml

@@ -1,4 +1,5 @@
 - type: guideEntry
   id: Bank
   name: guide-entry-bank
-  text: "/ServerInfo/_NF/Guidebook/Bank.xml"
+  text: "/ServerInfo/_NF/Guidebook/Bank.xml"
+  priority: 0

Resources/Prototypes/_NF/Guidebook/expeditions.yml

@@ -0,0 +1,67 @@
+- type: guideEntry
+  id: Expeditions
+  name: guide-entry-expeditions
+  text: "/ServerInfo/_NF/Guidebook/Expeditions.xml"
+  priority: 3
+  # children: # TODO: flesh these out
+  # - ExpeditionFactionCarp
+  # - ExpeditionFactionCultists
+  # - ExpeditionFactionDinosaurs
+  # - ExpeditionFactionExplorers
+  # - ExpeditionFactionFlesh
+  # - ExpeditionFactionGangers
+  # - ExpeditionFactionMercenaries
+  # - ExpeditionFactionSilicons
+  # - ExpeditionFactionSyndicate
+  # - ExpeditionFactionXenos
+
+# TODO: flesh these out
+# - type: guideEntry
+#   id: ExpeditionFactionCarp
+#   name: guide-entry-expedition-faction-carp
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Carp.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionCultists
+#   name: guide-entry-expedition-faction-cultists
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Cultists.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionDinosaurs
+#   name: guide-entry-expedition-faction-dinosaurs
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Dinosaurs.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionExplorers
+#   name: guide-entry-expedition-faction-explorers
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Explorers.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionFlesh
+#   name: guide-entry-expedition-faction-flesh
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Flesh.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionGangers
+#   name: guide-entry-expedition-faction-gangers
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Gangers.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionMercenaries
+#   name: guide-entry-expedition-faction-mercenaries
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Mercenaries.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionSilicons
+#   name: guide-entry-expedition-faction-silicons
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Silicons.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionSyndicate
+#   name: guide-entry-expedition-faction-syndicate
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Syndicate.xml"
+
+# - type: guideEntry
+#   id: ExpeditionFactionXenos
+#   name: guide-entry-expedition-faction-xenos
+#   text: "/ServerInfo/_NF/Guidebook/ExpeditionFactions/Xenos.xml"

Resources/Prototypes/_NF/Guidebook/hiring.yml

@@ -0,0 +1,5 @@
+- type: guideEntry
+  id: Hiring
+  name: guide-entry-hiring
+  text: "/ServerInfo/_NF/Guidebook/Hiring.xml"
+  priority: 1

Resources/Prototypes/_NF/Guidebook/nf14.yml

@@ -5,4 +5,7 @@
   priority: -1
   children:
   - Bank
+  - Hiring
+  - Piloting
+  - Expeditions
   - Shipyard

Resources/Prototypes/_NF/Guidebook/piloting.yml

@@ -0,0 +1,5 @@
+- type: guideEntry
+  id: Piloting
+  name: guide-entry-piloting
+  text: "/ServerInfo/_NF/Guidebook/Piloting.xml"
+  priority: 2

Resources/Prototypes/_NF/Guidebook/shipyard.yml

@@ -2,6 +2,7 @@
   id: Shipyard
   name: guide-entry-shipyard
   text: "/ServerInfo/_NF/Guidebook/Shipyard.xml"
+  priority: 4
   children:
   - ShipyardAmbition
   - ShipyardBrigand

Resources/Prototypes/_NF/Hydroponics/seeds.yml

@@ -41,3 +41,31 @@
       Min: 1
       Max: 4
       PotencyDivisor: 25
+
+- type: seed
+  id: coffee
+  name: seeds-coffee-name
+  noun: seeds-noun-seeds
+  displayName: seeds-coffee-display-name
+  plantRsi: _NF/Objects/Specific/Hydroponics/coffee.rsi
+  packetPrototype: CoffeeSeeds
+  productPrototypes:
+    - FoodCoffee
+  lifespan: 25
+  maturation: 9
+  production: 1
+  yield: 2
+  potency: 5
+  idealLight: 8
+  growthStages: 5
+  harvestRepeat: Repeat
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 2
+      Max: 8
+      PotencyDivisor: 16
+    Theobromine:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25

Resources/Prototypes/_NF/Objects/Consumable/Food/ingredients.yml

@@ -0,0 +1,98 @@
+- type: entity
+  name: raw coffee beans
+  parent: FoodProduceBase
+  id: FoodCoffeeBeansRaw
+  description: Green coffee beans, just waiting to be roasted.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bitter
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1
+        - ReagentId: Theobromine # Caffeine
+          Quantity: 1
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
+    state: produce-beans
+  - type: Tag
+    tags:
+    - Fruit
+  - type: Construction
+    graph: Coffee
+    node: start
+    defaultTarget: light roasted coffee
+  - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them
+  - type: Temperature # Temperature components needed to cook the beans
+    currentTemperature: 290
+  - type: InternalTemperature
+    thickness: 0.008 # 8mm (roughly bean sized)
+    area: .2 # essentially a giant sheet of beans
+
+- type: entity
+  name: light roasted coffee beans
+  parent: FoodProduceBase
+  id: FoodCoffeeBeansRoastedLight
+  description: Cinnamon roast coffee beans. Bright and fruity.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bitter
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: CoffeeGrounds
+          Quantity: 5
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
+    state: produce-beans-light
+  - type: Tag
+    tags:
+    - Fruit
+  - type: Construction
+    graph: Coffee
+    node: light roasted coffee
+    defaultTarget: medium roasted coffee
+  - type: AtmosExposed # Expose the beans to atmosphere - heats and cools them
+  - type: Temperature # Temperature components needed to cook the beans
+  - type: InternalTemperature
+    thickness: 0.008 # 8mm (roughly bean sized)
+    area: .2 # essentially a giant sheet of beans
+    conductivity: 1.5 # Arbitrarily chosen
+  - type: Extractable
+    grindableSolutionName: food
+
+- type: entity
+  name: medium roasted coffee beans
+  parent: FoodCoffeeBeansRoastedLight
+  id: FoodCoffeeBeansRoastedMedium
+  description: City roast coffee beans. Smooth and nutty.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
+    state: produce-beans-medium
+  - type: Construction
+    graph: Coffee
+    node: medium roasted coffee
+    defaultTarget: dark roasted coffee
+
+- type: entity
+  name: dark roasted coffee beans
+  parent: FoodCoffeeBeansRoastedLight
+  id: FoodCoffeeBeansRoastedDark
+  description: Viennese roast coffee beans. Smoky and spicy.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
+    state: produce-beans-dark
+  - type: Construction
+    graph: Coffee
+    node: dark roasted coffee

Resources/Prototypes/_NF/Objects/Consumable/Food/produce.yml

@@ -0,0 +1,31 @@
+- type: entity
+  name: coffee berries
+  parent: FoodProduceBase
+  id: FoodCoffee
+  description: Red berries encasing coffee beans.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bitter
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Theobromine
+          Quantity: 1
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Hydroponics/coffee.rsi
+  - type: Produce
+    seedId: coffee
+  - type: Tag
+    tags:
+    - Fruit
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodCoffeeBeansRaw
+    sound:
+      path: /Audio/Effects/packetrip.ogg