Update submarine

Simple-Station · May 11, 2024 · 3a1bf4a · 3a1bf4a
1 parent dcbb94d
commit 3a1bf4a
Show file tree

Hide file tree

Showing 1,168 changed files with 1,961 additions and 3,190 deletions.
diff --git a/...ces/Locale/en-US/_ds14/advertisements.ftl → ...S/advertisements/vending/bay12Vendors.ftl b/...ces/Locale/en-US/_ds14/advertisements.ftl → ...S/advertisements/vending/bay12Vendors.ftl
diff --git a/Resources/Locale/en-US/_ds14/reagents.ftl → ...s/Locale/en-US/reagents/bay12reagents.ftl b/Resources/Locale/en-US/_ds14/reagents.ftl → ...s/Locale/en-US/reagents/bay12reagents.ftl
diff --git a/...endingMachines/Advertisements/fitness.yml → ...endingMachines/Advertisements/fitness.yml b/...endingMachines/Advertisements/fitness.yml → ...endingMachines/Advertisements/fitness.yml
diff --git a/...endingMachines/Advertisements/hotfood.yml → ...endingMachines/Advertisements/hotfood.yml b/...endingMachines/Advertisements/hotfood.yml → ...endingMachines/Advertisements/hotfood.yml
diff --git a/...ndingMachines/Advertisements/solsnack.yml → ...ndingMachines/Advertisements/solsnack.yml b/...ndingMachines/Advertisements/solsnack.yml → ...ndingMachines/Advertisements/solsnack.yml
diff --git a/...ndingMachines/Advertisements/weebvend.yml → ...ndingMachines/Advertisements/weebvend.yml b/...ndingMachines/Advertisements/weebvend.yml → ...ndingMachines/Advertisements/weebvend.yml
diff --git a/...g/VendingMachines/Inventories/fitness.yml → ...g/VendingMachines/Inventories/fitness.yml b/...g/VendingMachines/Inventories/fitness.yml → ...g/VendingMachines/Inventories/fitness.yml
diff --git a/...g/VendingMachines/Inventories/hotfood.yml → ...g/VendingMachines/Inventories/hotfood.yml b/...g/VendingMachines/Inventories/hotfood.yml → ...g/VendingMachines/Inventories/hotfood.yml
diff --git a/.../VendingMachines/Inventories/solsnack.yml → .../VendingMachines/Inventories/solsnack.yml b/.../VendingMachines/Inventories/solsnack.yml → .../VendingMachines/Inventories/solsnack.yml
diff --git a/.../VendingMachines/Inventories/weebvend.yml → .../VendingMachines/Inventories/weebvend.yml b/.../VendingMachines/Inventories/weebvend.yml → .../VendingMachines/Inventories/weebvend.yml
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -162,3 +162,47 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
+
+- type: entity
+  parent: DrinkCartonBaseFull
+  id: DrinkCartonBaseSmallFull
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 25
+
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkMilkCartonMini
+  name: mini milk
+  description: An opaque white liquid produced by the mammary glands of mammals.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 25
+        reagents:
+        - ReagentId: Milk
+          Quantity: 25
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/milkmini.rsi
+    state: icon
+
+- type: entity
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  id: DrinkMilkCartonMiniChocolate
+  name: mini choco milk
+  description: A milk drink flavored with chocolate.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 25
+        reagents:
+        - ReagentId: MilkChoco
+          Quantity: 25
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/milkminichoco.rsi
+    state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2121,3 +2121,62 @@
     - type: Icon
       sprite: Objects/Consumable/Drinks/bloodglass.rsi
       state: icon
+
+- type: entity
+  parent: DrinkBase
+  id: DrinkBasePlastic
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+
+- type: entity
+  parent: DrinkBasePlastic
+  id: DrinkFitnessShakerBlack
+  name: fitness shaker
+  description: Big enough to contain enough protein to get perfectly swole. Don't mind the bits.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shakerblack.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkFitnessShakerBlack
+  id: DrinkFitnessShakerRed
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shakerred.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkFitnessShakerBlack
+  id: DrinkFitnessShakerBlue
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shakerblue.rsi
+    state: icon
+
+- type: reagent
+  id: MilkChoco
+  name: reagent-name-milk-choco
+  group: Drinks
+  desc: reagent-desc-milk-choco
+  physicalDesc: reagent-physical-desc-opaque
+  flavor: chocolate
+  color: "#664300"
+  recognizable: true
+  plantMetabolism:
+    - !type:PlantAdjustNutrition
+      amount: 0.1
+    - !type:PlantAdjustWater
+      amount: 0.9
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -648,3 +648,23 @@
       reagents:
       - ReagentId: CocoaPowder
         Quantity: 2
+
+- type: entity
+  parent: BaseFoodCondimentPacket
+  id: FoodCondimentPacketProtein
+  name: protein powder packet
+  description: Contains 10u of powdered protein. Mix with 20u of water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Protein
+          Quantity: 10
+  - type: Icon
+    state: packet-greygoo
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-