Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a new condiment station #2637

Merged
merged 13 commits into from
Jan 4, 2025
11 changes: 11 additions & 0 deletions Content.Shared/_NF/Containers/CondimentCupComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Robust.Shared.GameStates;

namespace Content.Shared._NF.Containers.Components;
/// <summary>
/// CondimentCup empty component
/// </summary>
[RegisterComponent, NetworkedComponent]
public sealed partial class CondimentCupComponent : Component
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-coldsauce = coldsauce
reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage.
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@
- SalvageTechFabCircuitboardNF # Frontier
- NFScrapProcessorCircuitboard # Frontier
- BlueprintLithographMachineCircuitboard # Frontier
- CondimentDispenserCircuitboard # Frontier
dynamicRecipes:
- ThermomachineFreezerMachineCircuitBoard
- HellfireFreezerMachineCircuitBoard
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: reagentDispenserInventory
id: CondimentDispenserInventory
inventory:
- DrinkAstrotameJug
- DrinkBbqSauceJug
- DrinkColdsauceJug
- DrinkHorseradishSauceJug
- DrinkHotsauceJug
- DrinkKetchupJug
- DrinkMustardJug
- DrinkSoysauceJug
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkAstrotameJug
name: astrotame jug
description: The sweetness of a thousand sugars but none of the calories. Put it in your coffee.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Astrotame
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-astrotame

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkBbqSauceJug
name: bbq sauce jug
description: Finally, ketchup for grownups.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: BbqSauce
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-bbq-sauce

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkColdsauceJug
name: coldsauce jug
description: Something to make every meal a little cooler.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Frostoil
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-coldsauce

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkHorseradishSauceJug
name: horseradish sauce jug
description: Now with 50% more horse.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: HorseradishSauce
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-horseradish-sauce

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkHotsauceJug
name: hotsauce jug
description: The antithesis of no more tears shampoo.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Hotsauce
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-hotsauce

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkKetchupJug
name: ketchup jug
description: Someone filled a tomato with sugar until it burst. Delicious.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Ketchup
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-ketchup

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkMustardJug
name: mustard jug
description: All of the implications of real mustard with none of the flavor.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Mustard
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-mustard

- type: entity
parent: DrinkBottlePlasticBaseFull
id: DrinkSoysauceJug
name: soy sauce jug
description: You can only dream of putting some of this on a bowl of rice.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 150
reagents:
- ReagentId: Soysauce
Quantity: 150
- type: Drink
- type: Label
currentLabel: reagent-name-soysauce
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,16 @@
- type: Icon
sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi
state: icon

# condiment cup
- type: entity
parent: DrinkWaterCup
id: CondimentCup
name: condiment cup
description: A flimsy cup that can be filled with condiments. Warranty void if filled with other things.
components:
- type: Sprite
sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/condiment_cup.rsi
- type: CondimentCup
19 changes: 19 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,22 @@
stackRequirements:
Steel: 5
Plastic: 5

- type: entity
id: CondimentDispenserCircuitboard
parent: BaseMachineCircuitboard
name: condiment dispenser machine board
description: A machine printed circuit board for a condiment dispenser.
components:
- type: Sprite
state: service
- type: MachineBoard
prototype: CondimentDispenserEmpty
requirements: # Frontier
MatterBin: 1 # Frontier
stackRequirements:
Steel: 5
tagRequirements:
GlassBeaker:
amount: 1
defaultPrototype: Beaker
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
- type: entity
name: condiment cup dispenser
description: It holds little condiment cups. They claim to be recyled.
id: CondimentCupDispenser
parent: [BaseItem, PaperBin]
components:
- type: Sprite
sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi
state: dispenser0
- type: ItemMapper
sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi
mapLayers:
dispenser1:
whitelist:
components:
- CondimentCup
- type: Bin
whitelist:
components:
- CondimentCup

- type: entity
name: condiment cup dispenser
suffix: 10
description: It holds little condiment cups. They claim to be recyled.
id: CondimentCupDispenser10
parent: CondimentCupDispenser
components:
- type: Bin
initialContents:
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
- CondimentCup
whitelist:
components:
- CondimentCup
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
parent: ReagentDispenserBase
id: CondimentDispenser
name: condiment dispenser
suffix: Filled
description: A condiment dispenser with a single slot for a condiment cup.
components:
- type: Rotatable
- type: Sprite
sprite: _NF/Structures/smalldispensers.rsi
drawdepth: SmallObjects
state: icon
- type: ReagentDispenser
storageWhitelist:
tags:
- DrinkBottle
pack: CondimentDispenserInventory
- type: Transform
noRot: false
- type: Machine
board: CondimentDispenserCircuitboard
- type: GuideHelp
guides:
- Bartender
- Drinks

- type: entity
id: CondimentDispenserEmpty
suffix: Empty
parent: CondimentDispenser
components:
- type: ReagentDispenser
storageWhitelist:
tags:
- DrinkBottle
pack: EmptyInventory
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@
- FoodPlateSmallPlastic
- NapkinDrum
- Napkin
- CondimentCupDispenser
- CondimentCup
## EVA
- ClothingOuterEVASuitHydro
- ClothingOuterEVASuitJanitor
Expand Down
10 changes: 9 additions & 1 deletion Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
Steel: 800
Glass: 900

- type: latheRecipe
parent: BaseCircuitboardRecipe
id: CondimentDispenserCircuitboard
result: CondimentDispenserCircuitboard
materials:
Steel: 100
Glass: 500

# Thrusters
- type: latheRecipe
id: ThrusterSecurityMachineCircuitboard
Expand Down Expand Up @@ -105,4 +113,4 @@
result: PortableGeneratorHyperPacmanMachineCircuitboard
materials:
Steel: 350
Glass: 350
Glass: 350
15 changes: 15 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,18 @@
Glass: 200
Plastic: 100
Steel: 100

- type: latheRecipe
id: CondimentCupDispenser
result: CondimentCupDispenser
parent: BaseServiceItemsRecipe
applyMaterialDiscount: false

- type: latheRecipe
id: CondimentCup
result: CondimentCup
parent: BaseServiceItemsRecipe
completetime: 0.1
applyMaterialDiscount: false
materials:
Steel: 10
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
id: NFVGRoidInterior

- type: Tag
id: NFFoamRPG
id: NFFoamRPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "dvir001 (GitHub)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "icon-0/1 by wallflowerghost(discord)",
"states": [
{
"name": "icon-0"
},
{
"name": "icon-1"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading