new-frontiers-14 · ErhardSteinhauer · Oct 27, 2024 · Oct 19, 2024 · Oct 19, 2024 · Oct 19, 2024
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
@@ -99,6 +99,12 @@ public partial class SeedData
     [DataField("noun")]
     public string Noun { get; private set; } = "";
 
+    /// <summary>
+    ///     Frontier: The localized string used for a set of seeds (or equivalent)
+    /// </summary>
+    [DataField("packetName")]
+    public string PacketName { get; private set; } = "botany-seed-packet-name";
+
     /// <summary>
     ///     Name displayed when examining the hydroponics tray. Describes the actual plant, not the seed itself.
     /// </summary>

diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -107,7 +107,7 @@ public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, Entit
 
         var name = Loc.GetString(proto.Name);
         var noun = Loc.GetString(proto.Noun);
-        var val = Loc.GetString("botany-seed-packet-name", ("seedName", name), ("seedNoun", noun));
+        var val = Loc.GetString(proto.PacketName, ("seedName", name), ("seedNoun", noun)); // Frontier: "botany-seed-packet-name"<proto.PacketName
         _metaData.SetEntityName(seed, val);
 
         // try to automatically place in user's other hand

diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
@@ -3,6 +3,7 @@ flavor-base-earthy = earthy
 
 flavor-complex-avocado = like avocado
 flavor-complex-cucumber = crisp and refreshing
+flavor-complex-honeycomb = like waxy honey
 flavor-complex-fast = fast
 flavor-complex-greed = like greed
 flavor-complex-blast = like jungle warfare

diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl
@@ -18,3 +18,9 @@ reagent-desc-bees-knees = BEEEEEEEEEEEEEEES!!! Has a stingy smell.
 
 reagent-name-cucumber-water = cucumber water
 reagent-desc-cucumber-water = The fanciest of waters.
+
+reagent-name-honey = honey
+reagent-desc-honey = Thick, golden and sticky, the original sweetener.
+
+reagent-name-honey-iced-tea = honey iced tea
+reagent-desc-honey-iced-tea = Tea with a splash of honey.
diff --git a/Resources/Locale/en-US/_NF/seeds/seeds.ftl b/Resources/Locale/en-US/_NF/seeds/seeds.ftl
@@ -1,3 +1,5 @@
+seeds-noun-nothing = {""}
+
 # Seeds
 seeds-spesos-name = speso
 seeds-spesos-display-name = speso trees
@@ -9,6 +11,11 @@ seeds-avocado-name = avocado
 seeds-avocado-display-name = avocado plants
 seeds-cucumber-name = cucumber
 seeds-cucumber-display-name = cucumber plants
+seeds-bees-name = bees
+seeds-bees-display-name = honeycomb
+
+# Should be in seed-component
+botany-seed-jar-name = jar of {$seedName} {$seedNoun}
 
 # Missing upstream definitions
 seeds-lemoon-display-name = lemoon trees
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -6,6 +6,7 @@
     AppleSeeds: 5
     AvocadoSeeds: 5 # Frontier
     BananaSeeds: 5
+    BeeSeeds: 5 # Frontier
     BerrySeeds: 5
     CarrotSeeds: 5
     CabbageSeeds: 5

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
@@ -151,6 +151,9 @@
       - id: FoodCucumber # Frontier
         amount: !type:RangeNumberSelector # Frontier
           range: 1, 5 # Frontier
+      - id: FoodHoneyComb # Frontier
+        amount: !type:RangeNumberSelector # Frontier
+          range: 1, 5 # Frontier
     #rare
     - !type:GroupSelector
       children:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -74,6 +74,10 @@
   components:
   - type: Sprite
     state: bun-honey
+  - type: FlavorProfile # Frontier
+    flavors: # Frontier
+      - honey # Frontier
+      - bread # Frontier
 
 - type: entity
   name: hotcross bun

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml
@@ -63,3 +63,19 @@
     - id: MaterialHideRosyMothroach
       amount: 1
       prob: 0.3
+
+- type: entity
+  name: bee
+  suffix: Angry, Timed
+  parent: [ MobAngryBee ]
+  id: MobAngryBeeTimed
+  components:
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 0.5
+  - type: TimedDespawn
+    lifetime: 15
+
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -0,0 +1,51 @@
+- type: entity
+  name: honey challah
+  parent: FoodBreadBase
+  id: FoodBreadChallah
+  description: Twisted bread sprinkled with poppy seeds.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - honey
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi
+    state: challah
+  - type: SliceableFood
+    slice: FoodBreadChallahSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 31
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 12
+        - ReagentId: Vitamin
+          Quantity: 8
+        - ReagentId: Flavorol
+          Quantity: 5
+
+- type: entity
+  name: challah slice
+  parent: FoodBreadSliceBase
+  id: FoodBreadChallahSlice
+  description: A slice of poppy and honey, oh my!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - honey
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6.2
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2.4
+        - ReagentId: Vitamin
+          Quantity: 1.6
+        - ReagentId: Flavorol
+          Quantity: 1
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi
+    state: challahslice
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -28,3 +28,72 @@
     color: "#FFFFCC"
     radius: 1.25
     energy: 0.75
+
+- type: entity
+  name: pear muffin
+  parent: FoodBakedBase
+  id: FoodBakedMuffinPear
+  description: I won't tell if you just try to pick out the chocolate.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chocolate
+      - muffin
+      - pear
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi
+    state: pearmuffin
+    scale: .75, .75
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: Flavorol
+          Quantity: 2
+        - ReagentId: Theobromine
+          Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: apple strudel bite
+  parent: FoodBakedBase
+  id: FoodBakedAppleStrudelBite
+  description: Just put a little icing on top and enjoy!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - honey
+      - butter
+      - bread
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi
+    layers:
+      - state: apple_strudel_1
+        map: [ "Variant" ]
+  - type: RandomSprite
+    available:
+      - Variant:
+          apple_strudel_1: ""
+          apple_strudel_2: ""
+          apple_strudel_3: ""
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Honey
+          Quantity: 2
+        - ReagentId: Flavorol
+          Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -0,0 +1,77 @@
+- type: entity
+  name: pear and cheese tart
+  parent: FoodPieBase
+  id: FoodTartPearCheese
+  description: The most sublime pair.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - cheesy
+      - pear
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/pie.rsi
+    layers:
+    - state: tin
+    - state: pearandcheese
+  - type: Tag
+    tags:
+    - Fruit
+    - Pie
+
+- type: entity
+  name: honey apple streusel pie
+  parent: FoodPieBase
+  id: FoodPieAppleHoney
+  description: A pie full of honey-laced apples baked under a crumbly oat streusel topping.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - honey
+      - apple
+      - oats
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/pie.rsi
+    layers:
+    - state: tin
+    - state: applecrisp
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: Flavorol
+          Quantity: 3
+  - type: SliceableFood
+    slice: FoodPieAppleHoneySlice
+  - type: Tag
+    tags:
+    - Fruit
+    - Pie
+
+- type: entity
+  name: slice of honey apple crumble pie
+  parent: FoodPieSliceBase
+  id: FoodPieAppleHoneySlice
+  description: A slice of honey-laced apples baked under a crumbly oat streusel topping.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - honey
+      - apple
+      - oats
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/Baked/pie.rsi
+    layers:
+    - state: applecrisp-slice
+    - state: alpha-slice-filling
+      color: "#e09b3a"
+  - type: Tag
+    tags:
+    - Fruit
+    - Pie
+    - Slice
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
@@ -205,24 +205,24 @@
     node: dark roasted coffee
     defaultTarget: Null # Overwriting light target
 
-- type: reagent
-  id: OilVegetable
-  name: reagent-name-oil-vegetable
-  group: Foods
-  desc: reagent-desc-oil-vegetable
-  physicalDesc: reagent-physical-desc-oily
-  flavor: oily
-  flavorMinimum: 0.05
-  color: "#ffff77"
-  meltingPoint: -6.0 #Taken from OilOlive
-  boilingPoint: 299.0
-  recognizable: true
-  metabolisms:
-    Food:
-      effects:
-      - !type:SatiateHunger 
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Nutriment
-          min: 0.1
-        factor: 1
+- type: entity
+  parent: [ReagentPacketBase, ItemHeftyBase]
+  id: ReagentContainerHoney
+  name: honey bottle
+  description: A big squeeze bottle of honey. Great for sweetening up your day!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/ingredients.rsi
+    state: honeybottle
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Honey
+          Quantity: 30
+  - type: Drink
+    solution: food
+    useSound:
+      path: /Audio/Items/eating_1.ogg
+