Merge conflict

DeltaV-Station · Nov 24, 2024 · 6dee3bf · 6dee3bf
1 parent e4ed00b
commit 6dee3bf
Showing 1 changed file with 31 additions and 31 deletions.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml
@@ -1,3 +1,34 @@
+- type: entity
+  parent: Pill
+  id: PillSoretizone
+  suffix: Soretizone 10u
+  components:
+  - type: Pill
+    pillType: 14
+  - type: Sprite
+    state: pill15
+  - type: Label
+    currentLabel: soretizone 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Soretizone
+          Quantity: 10
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterSoretizone
+  suffix: Soretizone 10u, 5
+  components:
+  - type: Label
+    currentLabel: soretizone 10u
+  - type: StorageFill
+    contents:
+    - id: PillSoretizone
+      amount: 5
+
 - type: entity
   parent: Pill
   id: PillSerenitol
@@ -215,37 +246,6 @@
     - id: PillStubantazine
       amount: 5
 
-- type: entity
-  parent: Pill
-  id: PillSoretizone
-  suffix: Soretizone 5u
-  components:
-  - type: Sprite
-    state: pill18
-  - type: Pill
-    pillType: 17
-  - type: Label
-    currentLabel: soretizone 5u
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 20
-        reagents:
-        - ReagentId: Soretizone
-          Quantity: 5
-
-- type: entity
-  parent: PillCanister
-  id: PillCanisterSoretizone
-  suffix: Soretizone 5u, 5
-  components:
-  - type: Label
-    currentLabel: soretizone 5u
-  - type: StorageFill
-    contents:
-    - id: PillSoretizone
-      amount: 5
-
 - type: entity
   parent: Pill
   id: PillAgonolexyne