juicebox + more random stuff

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml

@@ -0,0 +1,123 @@
+- type: entity
+  parent: DrinkBase
+  id: DrinkJuiceBoxBaseFull
+  abstract: true
+  components:
+  - type: Openable
+    sound:
+      collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯
+  - type: Sealable
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 20
+  - type: Item
+    size: Small
+  - type: MeleeWeapon
+    soundNoDamage:
+      path: "/Audio/Effects/Fluids/splat.ogg"
+    damage:
+      types:
+        Blunt: 0
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+        #In future maybe add generic plastic scrap trash/debris
+  - type: TrashOnSolutionEmpty
+    solution: drink
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon"}
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuiceOrangeJuicebox
+  name: orange juice box
+  description: A great source of vitamins. Stay healthy!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceOrange
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuicePineappleJuicebox
+  name: pineapple juice box
+  description: Everyone's favourite juice.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuicePineapple
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuiceAppleJuicebox
+  name: apple juice box
+  description: Sweet apple juice. Don't be late for school!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceApple
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuiceGrapeJuicebox
+  name: grape juice box
+  description: Tasty grape juice in a fun little container. Non-alcoholic!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceGrape
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkChocolateJuicebox
+  name: chocolate milk juice box
+  description: Tasty chocolate juice and milk in a small box. Contains Theobromine.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: HotCocoa
+          Quantity: 10
+        - ReagentId: Milk # The milk of chocolate milk
+          Quantity: 10
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml

@@ -42,28 +42,74 @@
   components:
   - type: StorageFill
     contents:
+    #Main
     - id: FoodPizzaArnoldSlice
       orGroup: HealthyOrUnhealthyMain
-      prob: 0.5
+      prob: 0.2
       amount: 2
-    - id: FoodApple
+    - id: FoodBurgerCheese
       orGroup: HealthyOrUnhealthyMain
-      prob: 0.5
-    - id: DrinkWaterBottleFull
+      prob: 0.2
+    - id: FoodCarrot
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    - id: FoodMothCapreseSalad
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    - id: FoodEggBoiled
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    #Drink
+    - id: DrinkJuiceOrangeJuicebox
       orGroup: HealthyOrUnhealthyDrink
-      prob: 0.5
-    - id: DrinkJuiceOrangeCarton
+      prob: 0.15
+    - id: DrinkJuicePineappleJuicebox
       orGroup: HealthyOrUnhealthyDrink
-      prob: 0.5
+      prob: 0.15
+    - id: DrinkJuiceAppleJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkJuiceGrapeJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkChocolateJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkWaterBottleFull
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    #Snack
     - id: FoodSnackCheesie
-      orGroup: HealthyOrUnhealthySnack
-      prob: 0.25
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackBoritos
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackChips
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackPistachios
+      orGroup: UnhealthySnack
+      prob: 0.15
     - id: FoodSnackChocolate
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackSus
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodMothMoffin
       orGroup: HealthyOrUnhealthySnack
-      prob: 0.25
-    - id: FoodCarrot
+      prob: 0.05
+    - id: FoodMothMothmallowSlice
       orGroup: HealthyOrUnhealthySnack
-      prob: 0.5
+      prob: 0.05
+    - id: FoodApple
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodBanana
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    #Note
     - id: PaperWrittenNoteFromMumGeneric
       prob: 0.1
 
@@ -76,9 +122,26 @@
   components:
   - type: StorageFill
     contents:
-    - id: FoodApple
-    - id: DrinkWaterBottleFull
+    #Main
     - id: FoodCarrot
+      orGroup: HealthyMain
+      prob: 0.5
+    - id: FoodMothCapreseSalad
+      orGroup: HealthyMain
+      prob: 0.5
+    - id: FoodEggBoiled
+      orGroup: HealthyMain
+      prob: 0.25
+    #Drink
+    - id: DrinkWaterBottleFull
+    #Snack
+    - id: FoodApple
+      orGroup: HealthySnack
+      prob: 0.5
+    - id: FoodBanana
+      orGroup: HealthySnack
+      prob: 0.5
+    #Note
     - id: PaperWrittenNoteFromMumHealthy
       prob: 0.1
 
@@ -91,15 +154,51 @@
   components:
   - type: StorageFill
     contents:
+    #Main
     - id: FoodPizzaArnoldSlice
       amount: 2
-    - id: DrinkJuiceOrangeCarton
+    #Drink
+    - id: DrinkJuiceOrangeJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkJuicePineappleJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkJuiceAppleJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkJuiceGrapeJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkChocolateJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    #Snack
     - id: FoodSnackCheesie
       orGroup: UnhealthySnack
-      prob: 0.25
+      prob: 0.15
+    - id: FoodSnackBoritos
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackChips
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackPistachios
+      orGroup: UnhealthySnack
+      prob: 0.15
     - id: FoodSnackChocolate
       orGroup: UnhealthySnack
-      prob: 0.25
+      prob: 0.15
+    - id: FoodSnackSus
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodMothMoffin
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.05
+    - id: FoodMothMothmallowSlice
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.05
+    #Note
     - id: PaperWrittenNoteFromMumUnhealthy
       prob: 0.1
 

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e and modified by Floofers",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}