From bfc53de39764bfdf7a889994e695a8373e7e6b19 Mon Sep 17 00:00:00 2001 From: ChilbroBaggins <107660393+ChilbroBaggins@users.noreply.github.com> Date: Thu, 12 Jan 2023 06:43:49 -0600 Subject: [PATCH] Adds Booze/Soda Dispenser boards (#13247) Co-authored-by: Jeff Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../catalog/research/technologies.ftl | 3 ++ .../Catalog/Research/technologies.yml | 19 ++++++++++ .../Circuitboards/Machine/production.yml | 36 +++++++++++++++++++ .../Entities/Structures/Dispensers/booze.yml | 5 +++ .../Entities/Structures/Dispensers/soda.yml | 7 +++- .../Entities/Structures/Machines/lathe.yml | 2 ++ .../Prototypes/Recipes/Lathes/electronics.yml | 18 ++++++++++ 7 files changed, 89 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl b/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl index dbe34733b5..d38c715637 100644 --- a/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl @@ -4,6 +4,9 @@ technologies-basic-research-technology-description = Nanotrasen basic research t technologies-cleaning-technology = Cleaning technology technologies-cleaning-technology-description = Start to a shiny clean station. +technologies-foodbev-technology = Food and beverage technology +technologies-food-and-beverage-technology-description = Robust service from better technology. + technologies-biological-technology = Biological technology technologies-biological-technology-description = Investigations into the natural world. diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index d3c18d0db1..000287155e 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -30,6 +30,25 @@ - SprayBottle - BodyBag +# Food/Bev Service Technology Tree + +- type: technology + name: technologies-foodbev-technology + id: FoodBevTechnology + description: technologies-food-and-beverage-technology-description + icon: + sprite: Objects/Weapons/Melee/cleaver.rsi + state: butch + requiredPoints: 5000 + requiredTechnologies: + - BasicResearch + unlockedRecipes: + - ButchCleaver + - KitchenKnife + - MicrowaveMachineCircuitboard + - BoozeDispenserMachineCircuitboard + - SodaDispenserMachineCircuitboard + # Biological Technology Tree - type: technology diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 251c950d46..7f5f6ce8a4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -677,3 +677,39 @@ materialRequirements: Steel: 10 Plasma: 5 + +- type: entity + id: BoozeDispenserMachineCircuitboard + parent: BaseMachineCircuitboard + name: booze dispenser machine board + description: A machine printed circuit board for a booze dispenser + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: BoozeDispenser + materialRequirements: + Steel: 5 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + +- type: entity + id: SodaDispenserMachineCircuitboard + parent: BaseMachineCircuitboard + name: soda dispenser machine board + description: A machine printed circuit board for a soda dispenser + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: soda_dispenser + materialRequirements: + Steel: 5 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml index a718032bf5..993b0a0d93 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml @@ -15,3 +15,8 @@ emagPack: BoozeDispenserEmagInventory - type: Transform noRot: false + - type: Machine + board: BoozeDispenserMachineCircuitboard + - type: Wires + BoardName: "BoozeDispenser" + LayoutId: BoozeDispenser diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml index 516784903b..79d65ccf1f 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml @@ -14,4 +14,9 @@ pack: SodaDispenserInventory emagPack: SodaDispenserEmagInventory - type: Transform - noRot: false + noRot: false + - type: Machine + board: SodaDispenserMachineCircuitboard + - type: Wires + BoardName: "SodaDispenser" + LayoutId: SodaDispenser diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 697c557eb5..7dd11ec44f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -316,6 +316,8 @@ - ExosuitFabricatorMachineCircuitboard - ArtifactAnalyzerMachineCircuitboard - TraversalDistorterMachineCircuitboard + - BoozeDispenserMachineCircuitboard + - SodaDispenserMachineCircuitboard - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 3be8038893..19280a620a 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -503,3 +503,21 @@ materials: Steel: 100 Glass: 900 + +- type: latheRecipe + id: BoozeDispenserMachineCircuitboard + icon: { sprite: Objects/Misc/module.rsi, state: id_mod } + result: BoozeDispenserMachineCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 900 + +- type: latheRecipe + id: SodaDispenserMachineCircuitboard + icon: { sprite: Objects/Misc/module.rsi, state: id_mod } + result: SodaDispenserMachineCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 900