]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Separates frost oil into coldsauce and frost oil (#34458)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Sat, 1 Feb 2025 15:20:01 +0000 (16:20 +0100)
committerGitHub <noreply@github.com>
Sat, 1 Feb 2025 15:20:01 +0000 (09:20 -0600)
12 files changed:
Resources/Locale/en-US/reagents/frostoil.ftl [new file with mode: 0644]
Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
Resources/Locale/en-US/reagents/meta/consumable/food/ingredients.ftl
Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml
Resources/Prototypes/Recipes/Reactions/food.yml
Resources/migration.yml

diff --git a/Resources/Locale/en-US/reagents/frostoil.ftl b/Resources/Locale/en-US/reagents/frostoil.ftl
new file mode 100644 (file)
index 0000000..f2181e7
--- /dev/null
@@ -0,0 +1,3 @@
+### Messages that pop up when metabolizing Frost Oil.
+
+frost-oil-effect-light-cold = You feel a slight cold tingle in your throat...
\ No newline at end of file
index 809fbafffd9c20d7f2c7e92375c68fc55c63236c..0fe7be6b371c6b6c56887f45782acc4844eab525 100644 (file)
@@ -7,8 +7,8 @@ reagent-desc-bbq-sauce = Hand wipes not included.
 reagent-name-cornoil = corn oil
 reagent-desc-cornoil = Corn oil, A delicious oil used in cooking. Made from corn.
 
-reagent-name-frostoil = frostoil
-reagent-desc-frostoil = Leaves the tongue numb in its passage.
+reagent-name-coldsauce = coldsauce
+reagent-desc-coldsauce = Leaves the tongue numb in its passage.
 
 reagent-name-horseradish-sauce = horseradish sauce
 reagent-desc-horseradish-sauce = Smelly horseradish sauce.
index 4f5c5ae78268cf0eff272fee080f42fccd3a208b..98dc73ecbc3149e6286b32ef09141d18a70e3759 100644 (file)
@@ -36,3 +36,6 @@ reagent-desc-oil = Used by chefs to cook.
 
 reagent-name-capsaicin-oil = Capsaicin Oil
 reagent-desc-capsaicin-oil = Capsaicin Oil is the ingredient found in different types of hot peppers.
+
+reagent-name-frost-oil = Frost Oil
+reagent-desc-frost-oil = Frost Oil is the ingredient found in chilly peppers, a rare pepper mutation.
index 70924a1e6e76271fc6da4286c2348797ecc6583e..d0304bd4ad6e5f905869d8d41c5d340c9c27645e 100644 (file)
@@ -3,7 +3,7 @@
   startingInventory:
     FoodCondimentPacketAstrotame: 5
     FoodCondimentPacketBbq: 5
-    FoodCondimentPacketFrostoil: 5
+    FoodCondimentPacketColdsauce: 5
     FoodCondimentPacketHorseradish: 5
     FoodCondimentPacketHotsauce: 5
     FoodCondimentPacketKetchup: 5
@@ -17,4 +17,4 @@
     SpoonPlastic: 10
     KnifePlastic: 10
     FoodPlatePlastic: 10
-    FoodPlateSmallPlastic: 10
\ No newline at end of file
+    FoodPlateSmallPlastic: 10
index bbe5cf244b2abf65f9aa9b371632b8af976de819..c7de98b4a44df68d0abeeaa7faccb2a693586e18 100644 (file)
 
 - type: entity
   parent: BaseFoodCondimentPacket
-  id: FoodCondimentPacketFrostoil
+  id: FoodCondimentPacketColdsauce
   name: coldsauce
   description: Coldsauce. Leaves the tongue numb in its passage.
   components:
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Frostoil
+        - ReagentId: Coldsauce
           Quantity: 10
   - type: Icon
     state: packet-frostoil
     solutions:
       food:
         reagents:
-        - ReagentId: Frostoil
+        - ReagentId: Coldsauce
           Quantity: 30
   - type: Sprite
     layers:
index 877f3d86f1aae30fd17743a47733f76458ceb011..ce5aa2eef5b76b90587824951eab964e8e5e2144 100644 (file)
         reagents:
           - ReagentId: Nutriment
             Quantity: 4
-          - ReagentId: Frostoil
+          - ReagentId: FrostOil
             Quantity: 10
           - ReagentId: Vitamin
             Quantity: 4
index 7349f3c3d72412e0d7e1a740f75dfd55a11e4005..de7be63d2b850c47bffc63dbce462958416d7077 100644 (file)
   idealLight: 9
   idealHeat: 298
   chemicals:
-    Frostoil:
+    FrostOil:
       Min: 1
       Max: 10
       PotencyDivisor: 10
index 4cc2810792f66a2af3e6d8ef8faa109deb14c386..f419605307e39cf542be3df80244d1540f43155f 100644 (file)
   color: darkred
   recognizable: true
 
+- type: reagent
+  id: Coldsauce
+  name: reagent-name-coldsauce
+  group: Foods
+  desc: reagent-desc-coldsauce
+  physicalDesc: reagent-physical-desc-cold
+  flavor: cold
+  color: skyblue
+
 - type: reagent
   id: Cornoil
   name: reagent-name-cornoil
   color: yellow
   recognizable: true
 
-- type: reagent
-  id: Frostoil
-  name: reagent-name-frostoil
-  group: Foods
-  desc: reagent-desc-frostoil
-  physicalDesc: reagent-physical-desc-cold
-  flavor: cold
-  color: skyblue
-
 - type: reagent
   id: HorseradishSauce
   name: reagent-name-horseradish-sauce
index d6f63055396cf7deb8ffdc4730b0d3896af82c33..d2cf44e6d64b2423ee009008f50a14f1694cbf2e 100644 (file)
       - !type:AdjustReagent
         reagent: Nutriment
         amount: 0.1
+
+- type: reagent
+  id: FrostOil
+  name: reagent-name-frost-oil
+  group: Foods
+  desc: reagent-desc-frost-oil
+  physicalDesc: reagent-physical-desc-oily
+  flavor: cold
+  color: skyblue
+  metabolisms:
+    Food:
+      effects:
+      - !type:AdjustReagent
+        reagent: Nutriment #Oils enhance nutrition
+        amount: 0.75
+    Poison:
+      effects:
+      - !type:AdjustTemperature
+        amount: -250 # thermal energy, not temp
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+        damage:
+          types:
+            Cold: 1
+      - !type:PopupMessage
+        type: Local
+        messages: [ "frost-oil-effect-light-cold" ]
+        probability: 0.2
index 790a236d5cf31acef988bfbd93f1a5aff77a9095..84d79466b9b679076214bfdcf404ec320e9c4ec2 100644 (file)
   reactants:
     Beer:
       amount: 10
-    Frostoil:
+    FrostOil:
       amount: 1
   products:
     IcedBeer: 10
index 7d524a9c7ae00fc608159dd397250b8d0c9889fd..6d32948f8942a67f6db8b47cee175dfee5254c2d 100644 (file)
   products:
     Hotsauce: 3
 
+- type: reaction
+  id: CookingColdsauce
+  reactants:
+    JuiceTomato:
+      amount: 1
+    TableSalt:
+      amount: 1
+    FrostOil:
+      amount: 1
+  products:
+    Coldsauce: 3
+
 - type: reaction
   id: CookingVinegar
   reactants:
index a6aa44b326dd6dcca2cb659d920a92cce1b1e8ee..b5e6294774ca9473775a775497fbc7b1af1ff863 100644 (file)
@@ -544,3 +544,6 @@ DrinkIrishCarBomb: DrinkIrishSlammer
 #2025-01-06
 ClothingMaskSexyClown: ClothingMaskBlushingClown
 ClothingMaskSexyMime: ClothingMaskBlushingMime
+
+# 2025-01-27
+FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce