Adds the jar of olive oil (#197)

Co-authored-by: Jeff <>
DeltaV-Station · Oct 19, 2023 · ab14a5b · ab14a5b
1 parent 7b2044c
commit ab14a5b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -42,8 +42,8 @@
       amount: 1
     - id: OilJarGhee
       amount: 1
-    - id: ReagentContainerOliveoil
-      amount: 1 #End Nyano code. 
+    - id: OilJarOlive
+      amount: 1 #End Nyano code.
     - id: ReagentContainerFlour
       amount: 3
     - id: ReagentContainerRice

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks_oil.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks_oil.yml
@@ -16,7 +16,7 @@
         drinkCanIcon:
           True: {state: "icon_open"}
           False: {state: "icon"}
-          
+
 - type: entity
   parent: BaseOilJar
   id: OilJarGhee
@@ -53,4 +53,23 @@
         maxVol: 100
         reagents:
         - ReagentId: Cornoil
-          Quantity: 100
+          Quantity: 100
+
+- type: entity
+  parent: BaseOilJar
+  id: OilJarOlive
+  name: jar of olive oil
+  description: A large tinted glass jar with a simple label of olives on it.
+  components:
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["drinkCanIcon"]
+      - state: olives
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+        reagents:
+        - ReagentId: OilOlive
+          Quantity: 100