Merge branch 'DeltaV-Station:master' into Morty-Plushie

DeltaV-Station · Dec 22, 2024 · bc46aa5 · bc46aa5
2 parents 551dc7d + 140024c
commit bc46aa5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: NullWanderer
-  changes:
-  - message: Fixed the spare ID safe being destructible
-    type: Fix
-  id: 308
-  time: '2024-04-11T12:47:31.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1078
 - author: Velcroboy
   changes:
   - message: Changed asteroids to have more ore...and some danger
@@ -3826,3 +3819,11 @@
   id: 807
   time: '2024-12-21T13:51:53.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2488
+- author: deltanedas
+  changes:
+  - message: You can now directly dump ore bags into ore processors by clicking on
+      them.
+    type: Tweak
+  id: 808
+  time: '2024-12-22T08:52:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2469
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -14,7 +14,7 @@
     ReagentContainerOliveoil: 2
     ReagentContainerMayo: 1
     VariantCubeBox: 1
-    FoodContainerEgg: 1
+    FoodContainerEgg: 2 # DeltaV - more eggs
     DrinkMilkCarton: 2
     DrinkSoyMilkCarton: 1
     FoodButter: 3

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -15,7 +15,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 100 # DeltaV - More reagents for chefs
   - type: SolutionTransfer
     # This is potentially badly-handled due to 'drink opening',
     #  but it lets the flour be tampered with, refilled, etc.
@@ -93,10 +93,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 100 # DeltaV - More reagents for chefs
         reagents:
         - ReagentId: Flour
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: [ReagentPacketBase, ItemHeftyBase]
@@ -127,7 +127,7 @@
       food:
         reagents:
         - ReagentId: Cornmeal
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase
@@ -158,7 +158,7 @@
       food:
         reagents:
         - ReagentId: Rice
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase
@@ -189,7 +189,7 @@
       food:
         reagents:
         - ReagentId: Sugar
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1386,6 +1386,8 @@
       transferSound:
         path: /Audio/Effects/Cargo/ping.ogg
     - type: MiningPointsLathe # DeltaV
+    - type: PlaceableSurface # DeltaV: Allow ore bags to dump into it directly
+      isPlaceable: false # but not place on it if you just click it with a random item
 
 - type: entity
   parent: OreProcessor

diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -8,15 +8,15 @@
   products:
     Protein: 0.5
 
-- type: reaction
-  id: EggCooking
-  impact: Low
-  minTemp: 344
-  reactants:
-    Egg:
-      amount: 0.5
-  products:
-    EggCooked: 0.5
+#- type: reaction # Delta V - Removed this reaction due to lack of function besides punishing chefs
+#  id: EggCooking
+#  impact: Low
+#  minTemp: 344
+#  reactants:
+#    Egg:
+#      amount: 0.5
+#  products:
+#    EggCooked: 0.5
 
 - type: reaction
   id: SapBoiling