diff --git a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl index 69ef7330a56..09067ec1d57 100644 --- a/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl +++ b/Resources/Locale/en-US/deltav/cargo/stocks-comapnies.ftl @@ -4,3 +4,4 @@ stock-trading-company-gorlex = Gorlex [GRX] stock-trading-company-interdyne = Interdyne Pharmaceuticals [INTP] stock-trading-company-fishinc = Fish Inc. [FIN] stock-trading-company-donk = Donk Co. [DONK] +stock-trading-company-hydroco = HydroCo [HYD] diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl new file mode 100644 index 00000000000..aaed484c664 --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/powdered_drinks.ftl @@ -0,0 +1,41 @@ +reagent-name-powdered-milk = powdered milk +reagent-desc-powdered-milk = A powder-based milk substitute that can be reconstituted with water. + +reagent-name-powdered-milk-soy = powdered soy milk +reagent-desc-powdered-milk-soy = A powder-based dairy-free milk substitute that can be reconstituted with water. + +reagent-name-powdered-juice-orange = powdered orange juice +reagent-desc-powdered-juice-orange = A powder-based orange juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-lime = powdered lime juice +reagent-desc-powdered-juice-lime = A powder-based lime juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-lemon = powdered lemon juice +reagent-desc-powdered-juice-lemon = A powder-based lemon juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-pineapple = powdered pineapple juice +reagent-desc-powdered-juice-pineapple = A powder-based pineapple juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-banana = powdered banana juice +reagent-desc-powdered-juice-banana = A powder-based banana juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-berry = powdered berry juice +reagent-desc-powdered-juice-berry = A powder-based berry juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-watermelon = powdered melon juice +reagent-desc-powdered-juice-watermelon = A powder-based watermelon juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-grape = powdered grape juice +reagent-desc-powdered-juice-grape = A powder-based grape juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-apple = powdered apple juice +reagent-desc-powdered-juice-apple = A powder-based apple juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-cherry = powdered cherry juice +reagent-desc-powdered-juice-cherry = A powder-based cherry juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-carrot = powdered carrot juice +reagent-desc-powdered-juice-carrot = A powder-based carrot juice substitute that can be reconstituted with water. + +reagent-name-powdered-juice-tomato = powdered tomato juice +reagent-desc-powdered-juice-tomato = A powder-based tomato juice substitute that can be reconstituted with water. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index 9fa3499e15c..7722f001a3b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -5,6 +5,8 @@ FoodSnackNutribrick: 5 FoodSnackMREBrownie: 5 FoodCondimentPacketKetchup: 5 + ReagentTinPowderedMilkSoy: 2 + ReagentTinPowderedJuiceOrange: 1 emaggedInventory: KitchenKnife: 2 SpaceMedipen: 3 diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml index abd64d33efe..f8645aa058a 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml @@ -37,3 +37,23 @@ cost: 3333 category: Food group: market + +- type: cargoProduct + id: FoodHydroCoDairy + icon: + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + state: icon-order-dairy + product: CrateHydroCoDairy + cost: 1500 + category: Food + group: market + +- type: cargoProduct + id: FoodHydroCoJuice + icon: + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + state: icon-order-juices + product: CrateHydroCoJuice + cost: 1500 + category: Food + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml index 067a9ed9777..fc4a8424f08 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml @@ -40,3 +40,85 @@ contents: - id: FoodPieBananaCream amount: 13 + +- type: entity + parent: CratePlastic + id: CrateHydroCoDairy + name: HydroCo Dairy crate + description: A shipment of powdered dairy products from HydroCo. Contains powdered milk and soy milk. + components: + - type: StorageFill + contents: + - id: PaperCrateHydroCoConsumption + - id: SpoonPlastic + amount: 2 + - id: ReagentTinPowderedMilk + amount: 2 + - id: ReagentTinPowderedMilkSoy + amount: 2 + +- type: entity + parent: CratePlastic + id: CrateHydroCoJuice + name: HydroCo Juice crate + description: A variety pack of powdered juice products from HydroCo. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: FillHydroCoJuiceMix + - !type:NestedSelector + tableId: FillHydroCoJuiceRandomTin + prob: 0.15 + - id: SpoonPlastic + amount: !type:ConstantNumberSelector + value: 2 + - id: PaperCrateHydroCoConsumption + +- type: entityTable + id: FillHydroCoJuiceMix + table: !type:AllSelector + children: + # Citrus + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceOrange + - id: ReagentTinPowderedJuiceLime + - id: ReagentTinPowderedJuiceLemon + # Berry + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceBerry + - id: ReagentTinPowderedJuiceGrape + - id: ReagentTinPowderedJuiceCherry + # Tropical + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuicePineapple + - id: ReagentTinPowderedJuiceBanana + - id: ReagentTinPowderedJuiceWatermelon + # Garden + - !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceApple + - id: ReagentTinPowderedJuiceCarrot + - id: ReagentTinPowderedJuiceTomato + +- type: entityTable + id: FillHydroCoJuiceRandomTin + table: !type:GroupSelector + children: + - id: ReagentTinPowderedJuiceLemon + - id: ReagentTinPowderedJuiceLime + - id: ReagentTinPowderedJuiceOrange + - id: ReagentTinPowderedJuicePineapple + - id: ReagentTinPowderedJuiceBanana + - id: ReagentTinPowderedJuiceWatermelon + - id: ReagentTinPowderedJuiceBerry + - id: ReagentTinPowderedJuiceGrape + - id: ReagentTinPowderedJuiceCherry + - id: ReagentTinPowderedJuiceApple + - id: ReagentTinPowderedJuiceCarrot + - id: ReagentTinPowderedJuiceTomato diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml new file mode 100644 index 00000000000..3e242a07f2a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/powdered_drinks.yml @@ -0,0 +1,339 @@ +- type: entity + abstract: true + parent: ReagentContainerBase + id: ReagentTinBase + components: + - type: Openable + openableByHand: false + sound: + path: /Audio/Items/can_open3.ogg + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon-open"} + False: {state: "icon"} + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 6 + behaviors: + - !type:OpenBehavior + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + heldPrefix: packet + size: Normal + - type: DamageOnLand + damage: + types: + Blunt: 3 + - type: DamageOtherOnHit + damage: + types: + Blunt: 3 + - type: Damageable + damageContainer: Inorganic + - type: StaticPrice + price: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceOrange + name: tin of powdered orange juice + description: A container of powdered orange juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFC420" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceOrange + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedMilk + name: tin of powdered milk + description: A container of powdered milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FAFAFA" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedMilk + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedMilkSoy + name: tin of powdered soy milk + description: A container of powdered soy milk manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the milk. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFFCE3" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedMilkSoy + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceLime + name: tin of powdered lime juice + description: A container of powdered lime juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#B4FF64" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceLime + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceLemon + name: tin of powdered lemon juice + description: A container of powdered lemon juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFFC69" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceLemon + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuicePineapple + name: tin of powdered pineapple juice + description: A container of powdered pineapple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFD644" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuicePineapple + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceBanana + name: tin of powdered banana juice + description: A container of powdered banana juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFFEBF" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceBanana + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceBerry + name: tin of powdered berry juice + description: A container of powdered berry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#D366FF" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceBerry + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceWatermelon + name: tin of powdered melon juice + description: A container of powdered watermelon juice manufactured by HydroCo. NOTE - Melon only; water not included, sold separately. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFBCDB" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceWatermelon + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceGrape + name: tin of powdered grape juice + description: A container of powdered grape juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#E57DFF" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceGrape + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceApple + name: tin of powdered apple juice + description: A container of powdered apple juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFC67E" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceApple + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceCherry + name: tin of powdered cherry juice + description: A container of powdered cherry juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#A9536C" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceCherry + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceCarrot + name: tin of powdered carrot juice + description: A container of powdered carrot juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#FFA06B" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceCarrot + Quantity: 50 + +- type: entity + parent: ReagentTinBase + id: ReagentTinPowderedJuiceTomato + name: tin of powdered tomato juice + description: A container of powdered tomato juice manufactured by HydroCo. According to the instructions, stirring with water in a 1:1 ratio will reconstitute the juice. + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: overlay-container + color: "#D85553" + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: PowderedJuiceTomato + Quantity: 50 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index 96fe66f08b4..2682f83ab88 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -30,3 +30,64 @@ id: PaperFugitiveReport name: fugitive report description: An arrest warrant for a space fugitive sent from GALPOL. + +- type: entity + parent: Paper + id: PaperCrateHydroCoConsumption + name: HydroCo Notice + categories: [ HideSpawnMenu ] + components: + - type: Paper + stampState: paper_stamp-generic + stampedBy: + - stampedColor: '#8F99D6FF' + stampedName: HydroCo + content: |2 + + [head=1]HydroCo - Hydrate Tastefully[/head] + + [bold]Consumption Notice[/bold] + HydroCo reminds all customers that powdered products + are NOT meant for direct consumption. Attempting to eat + the powder directly is a choking hazard and may result + in severe discomfort. + + Always mix with water according to package instructions + before consuming. + + Thank you for choosing HydroCo! + Enjoy your drinks! + +- type: entity + parent: Paper + id: PaperMailHydroCoTrial + name: HydroCo Trial Message + categories: [ HideSpawnMenu ] + components: + - type: Paper + stampState: paper_stamp-generic + stampedBy: + - stampedColor: '#8F99D6FF' + stampedName: HydroCo + content: |2 + + [head=1]HydroCo - Hydrate Tastefully[/head] + + [bold]Dear Recipient,[/bold] + you have been selected among thousands of potential + beneficiaries to receive a full-size trial tin of HydroCo + powdered juice! + + We think you will enjoy the flavor and hope to see you + as a returning customer. + + [bold]Consumption Notice[/bold] + HydroCo reminds all customers that powdered products + are NOT meant for direct consumption. Attempting to eat + the powder directly is a choking hazard and may result in + severe discomfort. + + Always mix with water according to package instructions + before consuming. + + Enjoy your drinks! diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml index 3d5d66fc2a2..2fa02ebc002 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml @@ -1698,3 +1698,37 @@ orGroup: Coat - id: ClothingOuterWinterCoatPlaid orGroup: Coat + +- type: entity + parent: BaseMail + id: MailHydroCoPowderJuice + suffix: HydroCo powder juice + components: + - type: Mail + contents: + - id: ReagentTinPowderedJuiceLemon + orGroup: Juice + - id: ReagentTinPowderedJuiceLime + orGroup: Juice + - id: ReagentTinPowderedJuicePineapple + orGroup: Juice + - id: ReagentTinPowderedJuiceBanana + orGroup: Juice + - id: ReagentTinPowderedJuiceBerry + orGroup: Juice + - id: ReagentTinPowderedJuiceWatermelon + orGroup: Juice + - id: ReagentTinPowderedJuiceGrape + orGroup: Juice + - id: ReagentTinPowderedJuiceApple + orGroup: Juice + - id: ReagentTinPowderedJuiceCherry + orGroup: Juice + - id: ReagentTinPowderedJuiceCarrot + orGroup: Juice + - id: ReagentTinPowderedJuiceTomato + orGroup: Juice + - id: SpoonPlastic + amount: 1 + - id: PaperMailHydroCoTrial + amount: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml index fe31706b262..89f420f1573 100644 --- a/Resources/Prototypes/DeltaV/Entities/Stations/base.yml +++ b/Resources/Prototypes/DeltaV/Entities/Stations/base.yml @@ -19,3 +19,6 @@ - displayName: stock-trading-company-donk basePrice: 90 currentPrice: 90 + - displayName: stock-trading-company-hydroco + basePrice: 30 + currentPrice: 30 diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml new file mode 100644 index 00000000000..13cd6bfe11d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/powdered_drinks.yml @@ -0,0 +1,191 @@ +- type: reagent + id: BasePowderedBeverage + abstract: true + physicalDesc: reagent-physical-desc-powdery + flavor: terrible + metabolisms: + Poison: + effects: + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedMilk + name: reagent-name-powdered-milk + group: Foods + desc: reagent-desc-powdered-milk + flavor: sweet + color: "#FAFAFA" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedMilkSoy + name: reagent-name-powdered-milk-soy + group: Foods + desc: reagent-desc-powdered-milk-soy + flavor: soy + color: "#FFFCE3" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceOrange + name: reagent-name-powdered-juice-orange + group: Foods + desc: reagent-desc-powdered-juice-orange + flavor: sour + color: "#FFC420" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceLime + name: reagent-name-powdered-juice-lime + group: Foods + desc: reagent-desc-powdered-juice-lime + flavor: sour + color: "#B4FF64" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceLemon + name: reagent-name-powdered-juice-lemon + group: Foods + desc: reagent-desc-powdered-juice-lemon + flavor: sour + color: "#FFFC69" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuicePineapple + name: reagent-name-powdered-juice-pineapple + group: Foods + desc: reagent-desc-powdered-juice-pineapple + flavor: sour + color: "#FFD644" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + - !type:Emote + emote: Cough + showInChat: true + probability: 0.33 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 15 + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceBanana + name: reagent-name-powdered-juice-banana + group: Foods + desc: reagent-desc-powdered-juice-banana + flavor: terrible + color: "#FFFEBF" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceBerry + name: reagent-name-powdered-juice-berry + group: Foods + desc: reagent-desc-powdered-juice-berry + flavor: bitter + color: "#D366FF" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceWatermelon + name: reagent-name-powdered-juice-watermelon + group: Foods + desc: reagent-desc-powdered-juice-watermelon + flavor: terrible + color: "#FFBCDB" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceGrape + name: reagent-name-powdered-juice-grape + group: Foods + desc: reagent-desc-powdered-juice-grape + flavor: sour + color: "#E57DFF" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceApple + name: reagent-name-powdered-juice-apple + group: Foods + desc: reagent-desc-powdered-juice-apple + flavor: sour + color: "#FFC67E" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceCherry + name: reagent-name-powdered-juice-cherry + group: Foods + desc: reagent-desc-powdered-juice-cherry + flavor: sour + color: "#A9536C" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceCarrot + name: reagent-name-powdered-juice-carrot + group: Foods + desc: reagent-desc-powdered-juice-carrot + flavor: bitter + color: "#FFA06B" + +- type: reagent + parent: BasePowderedBeverage + id: PowderedJuiceTomato + name: reagent-name-powdered-juice-tomato + group: Foods + desc: reagent-desc-powdered-juice-tomato + flavor: bitter + color: "#D85553" diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml new file mode 100644 index 00000000000..262c40afce2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/powdered_drinks.yml @@ -0,0 +1,167 @@ +- type: reaction + id: ReconstitutePowderedMilk + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedMilk: + amount: 1 + products: + Milk: 2 + +- type: reaction + id: ReconstitutePowderedMilkSoy + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedMilkSoy: + amount: 1 + products: + MilkSoy: 2 + +- type: reaction + id: ReconstitutePowderedJuiceOrange + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceOrange: + amount: 1 + products: + JuiceOrange: 2 + +- type: reaction + id: ReconstitutePowderedJuiceLemon + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceLemon: + amount: 1 + products: + JuiceLemon: 2 + +- type: reaction + id: ReconstitutePowderedJuiceLime + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceLime: + amount: 1 + products: + JuiceLime: 2 + +- type: reaction + id: ReconstitutePowderedJuicePineapple + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuicePineapple: + amount: 1 + products: + JuicePineapple: 2 + +- type: reaction + id: ReconstitutePowderedJuiceBanana + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceBanana: + amount: 1 + products: + JuiceBanana: 2 + +- type: reaction + id: ReconstitutePowderedJuiceWatermelon + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceWatermelon: + amount: 1 + products: + JuiceWatermelon: 2 + +- type: reaction + id: ReconstitutePowderedJuiceBerry + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceBerry: + amount: 1 + products: + JuiceBerry: 2 + +- type: reaction + id: ReconstitutePowderedJuiceGrape + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceGrape: + amount: 1 + products: + JuiceGrape: 2 + +- type: reaction + id: ReconstitutePowderedJuiceApple + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceApple: + amount: 1 + products: + JuiceApple: 2 + +- type: reaction + id: ReconstitutePowderedJuiceCherry + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceCherry: + amount: 1 + products: + JuiceCherry: 2 + +- type: reaction + id: ReconstitutePowderedJuiceCarrot + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceCarrot: + amount: 1 + products: + JuiceCarrot: 2 + +- type: reaction + id: ReconstitutePowderedJuiceTomato + requiredMixerCategories: + - Stir + reactants: + Water: + amount: 1 + PowderedJuiceTomato: + amount: 1 + products: + JuiceTomato: 2 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png new file mode 100644 index 00000000000..ddccc536a65 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png new file mode 100644 index 00000000000..f83b746104f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-dairy.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png new file mode 100644 index 00000000000..050af5368b9 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon-order-juices.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png new file mode 100644 index 00000000000..1207db777ea Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json new file mode 100644 index 00000000000..244894f967a --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original image of canned beans (beans.rsi) taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Modified by DisposableCrewmember42.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "overlay-container" + }, + { + "name": "icon-order-juices" + }, + { + "name": "icon-order-dairy" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png new file mode 100644 index 00000000000..7e01d12b377 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/powdered_drinks.rsi/overlay-container.png differ