From 69d953749d376f1258f81c77630c96e314bec7b7 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Sun, 11 Aug 2024 19:45:26 -0400
Subject: [PATCH 1/2] Party crate suggestions

---
 .../Prototypes/Catalog/Cargo/cargo_fun.yml    |  3 +--
 .../Prototypes/Catalog/Fills/Crates/fun.yml   | 20 +++++++++----------
 .../Objects/Consumable/Drinks/drinks_cups.yml |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index c3d9853af20..b1790bc48f8 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -77,12 +77,11 @@
 
 - type: cargoProduct
   id: FunParty
-  abstract: true # Frontier - No cake from cargo
   icon:
     sprite: Objects/Consumable/Food/Baked/cake.rsi
     state: birthday
   product: CrateFunParty
-  cost: 1000
+  cost: 7500 # Frontier:1000<7500
   category: cargoproduct-category-name-fun
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index deb51b91763..739548b60a8 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -225,27 +225,27 @@
   - type: StorageFill
     contents:
       - id: GlowstickBase
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickBlue
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickPurple
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickRed
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: GlowstickYellow
-        amount: 2
-      - id: FoodCakeBirthdayFake #Frontier: Replaced the regular birthday cake with a fake, low food value variant.
+        amount: 1
+      - id: FoodCakeBirthdayFake #Frontier: FoodCakeBirthday<FoodCakeBirthdayFake (less food)
       - id: DrinkLean
         amount: 4
       - id: KnifePlastic
       - id: ClothingHeadHatPartyRed
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: ClothingHeadHatPartyYellow
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: ClothingHeadHatPartyGreen
-        amount: 2
+        amount: 1 # Frontier: 2<1
       - id: ClothingHeadHatPartyBlue
-        amount: 2
+        amount: 1 # Frontier: 2<1
 
 - type: entity
   id: CrateFunWaterGuns
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 103423fc098..ee8b3c79f75 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -316,14 +316,14 @@
 - type: entity
   parent: DrinkBaseCup
   id: DrinkLean
-  name: grape Juice
+  name: grape juice # Frontier: grape Juice<grape juice
   description: Damn, no fun allowed.
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         reagents:
-        - ReagentId: Water
+        - ReagentId: JuiceGrape # Frontier: Water<JuiceGrape
           Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lean.rsi

From cf7eb48f501d6b9b2ed5a3dbd145e2ac06878623 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Sun, 11 Aug 2024 19:46:52 -0400
Subject: [PATCH 2/2] Missing comment

---
 Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 739548b60a8..a98a3a56cdf 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -233,7 +233,7 @@
       - id: GlowstickRed
         amount: 1 # Frontier: 2<1
       - id: GlowstickYellow
-        amount: 1
+        amount: 1 # Frontier: 2<1
       - id: FoodCakeBirthdayFake #Frontier: FoodCakeBirthday<FoodCakeBirthdayFake (less food)
       - id: DrinkLean
         amount: 4