diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml new file mode 100644 index 000000000000..1d0eb4e85060 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml index a301848ee75d..81f3aeb591b7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml +++ b/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 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png new file mode 100644 index 000000000000..e8fd6f987862 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png new file mode 100644 index 000000000000..06a5ba1f4e39 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json new file mode 100644 index 000000000000..bf25cd289713 --- /dev/null +++ b/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" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png new file mode 100644 index 000000000000..d115d6983370 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png new file mode 100644 index 000000000000..8021fdc84077 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json new file mode 100644 index 000000000000..719567215e01 --- /dev/null +++ b/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" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png new file mode 100644 index 000000000000..3a47b141691f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png new file mode 100644 index 000000000000..55b879064044 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json new file mode 100644 index 000000000000..bf25cd289713 --- /dev/null +++ b/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" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png new file mode 100644 index 000000000000..ebe1a123d69b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png new file mode 100644 index 000000000000..fefe447542c6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json new file mode 100644 index 000000000000..bf25cd289713 --- /dev/null +++ b/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" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png new file mode 100644 index 000000000000..2402cff41e3e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png new file mode 100644 index 000000000000..db97ee7d3dd4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json new file mode 100644 index 000000000000..bf25cd289713 --- /dev/null +++ b/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" + } + ] +}