diff --git a/Resources/Locale/en-US/reagents/Capsaicin.ftl b/Resources/Locale/en-US/reagents/Capsaicin.ftl new file mode 100644 index 0000000000..42202a4d38 --- /dev/null +++ b/Resources/Locale/en-US/reagents/Capsaicin.ftl @@ -0,0 +1,4 @@ +### Messages that pop up when metabolizing Capsaicin Oil. + +capsaicin-effect-light-burn = You feel a slight tingle in your throat... +capsaicin-effect-heavy-burn = You feel like hell threw up in your mouth! diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index b1f4ba9713..6c93859f04 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -54,12 +54,12 @@ id: CrateHydroponicsSeeds name: seeds crate parent: CrateHydroponics - description: "Big things have small beginnings. Contains nine different seeds." + description: "Big things have small beginnings. Contains ten different seeds." components: - type: StorageFill contents: -# - id: ChiliSeeds -# amount: 1 + - id: ChiliSeeds + amount: 1 # - id: CottonSeeds # amount: 1 # - id: BerrySeeds diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml index a13d46df4b..125a5d1260 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml @@ -3,6 +3,7 @@ inventory: - Aluminium - Carbon + - CapsaicinOil - Chlorine - Copper - Ethanol diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index e43eb993f6..b77b355922 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -8,6 +8,7 @@ BananaSeeds: 10 CarrotSeeds: 10 ChanterelleSeeds: 10 + ChiliSeeds: 10 CornSeeds: 10 EggplantSeeds: 10 LemonSeeds: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 594fea19b0..18751ecbed 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -240,3 +240,23 @@ - type: Sprite state: saltysweet # Tastes awesome. + +- type: entity + name: queso + parent: FoodMealBase + id: FoodMealQueso + description: A classic dipping sauce that you can't go wrong with. + components: + - type: Sprite + state: queso +# Its queso! Everyone loves queso... Right?. + +- type: entity + name: enchiladas + parent: FoodMealBase + id: FoodMealEnchiladas + description: Viva La Mexico! + components: + - type: Sprite + state: enchiladas +# What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 503ba2497e..ccedcbdbb1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -26,6 +26,7 @@ state: produce - type: Produce - type: Extractable + grindableSolutionName: food # Subclasses @@ -547,3 +548,22 @@ components: - type: Sprite sprite: Objects/Specific/Hydroponics/onion_red.rsi + +- type: entity + name: chili + parent: FoodProduceBase + id: FoodChili + description: Spicy, best not touch your eyes. + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 1 + - type: Sprite + sprite: Objects/Specific/Hydroponics/chili.rsi + - type: Produce + seed: chili diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index a708c7243c..f772cde850 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -334,7 +334,7 @@ # Tastes like chaos. - type: entity - name: hot chili + name: bowl of hot chili parent: FoodBowlBase id: FoodSoupChiliHot description: A Texan five-alarm chili! @@ -343,6 +343,14 @@ layers: - state: bowl - state: chili-hot + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: CapsaicinOil + Quantity: 5 # Tastes like hot peppers. - type: entity @@ -367,6 +375,14 @@ layers: - state: bowl - state: chili-clown + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: CapsaicinOil + Quantity: 5 # Tastes like tomato, hot peppers, clown feet, kind of funny, someone's parents. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 4d8ad1d51b..d6a280e6d6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -192,3 +192,14 @@ seed: nettle - type: Sprite sprite: Objects/Specific/Hydroponics/nettle.rsi + +- type: entity + parent: SeedBase + name: packet of chili seeds + description: "Spicy." + id: ChiliSeeds + components: + - type: Seed + seed: chili + - type: Sprite + sprite: Objects/Specific/Hydroponics/chili.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 02d9b2c056..b4a1557a00 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -424,7 +424,7 @@ Min: 1 Max: 10 PotencyDivisor: 10 - + - type: seed id: nettle name: nettle @@ -447,3 +447,25 @@ Min: 1 Max: 25 PotencyDivisor: 4 + +- type: seed + id: chili + name: chili + seedName: chili + displayName: chilis + plantRsi: Objects/Specific/Hydroponics/chili.rsi + productPrototypes: + - FoodChili + harvestRepeat: Repeat + lifespan: 25 + maturation: 6 + production: 6 + yield: 3 + potency: 20 + idealLight: 9 + idealHeat: 298 + chemicals: + CapsaicinOil: + Min: 1 + Max: 10 + PotencyDivisor: 10 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 8de7b7f9ef..29fc1e187f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -111,3 +111,30 @@ meltingPoint: -16.0 tileReactions: - !type:FlammableTileReaction {} + +- type: reagent + id: CapsaicinOil + name: Capsaicin Oil + desc: Capsaicin Oil is the ingredient found in different types of hot peppers. + physicalDesc: oily + color: "#FF0000" + meltingPoint: 146 + boilingPoint: 410 # Really high boiling point compared to its melting + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + groups: + Caustic: 0.5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 5 + damage: + groups: + Caustic: 1 + - !type:PopupMessage + type: Local + messages: [ "capsaicin-effect-light-burn" ] + probability: 0.2 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index bdd934bf03..f82f4513b4 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -433,6 +433,51 @@ solids: FoodDonkpocketGondola: 1 +- type: microwaveMealRecipe + id: RecipeHotChili + name: hot chili recipe + result: FoodSoupChiliHot + time: 20 + solids: + FoodChili: 1 + FoodMeatCutlet: 1 + FoodOnionSlice: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: RecipeChiliClown + name: chili con carnival recipe + result: FoodSoupChiliClown + time: 30 + solids: + FoodChili: 1 + FoodMeatCutlet: 1 + FoodOnionSlice: 1 + FoodTomato: 1 + ClothingShoesClown: 1 + +- type: microwaveMealRecipe + id: RecipeQueso + name: queso recipe + result: FoodMealQueso + time: 15 + #todo Add blackpepper + #reagents: + #blackpepper: 5 + solids: + FoodChili: 1 + FoodCheeseSlice: 2 + +- type: microwaveMealRecipe + id: RecipeEnchiladas + name: enchiladas recipe + result: FoodMealEnchiladas + time: 20 + solids: + FoodChili: 2 + FoodMeatCutlet: 1 + FoodCorn: 1 + # NOT ACTUAL FOOD - type: microwaveMealRecipe diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index d36390ab10..c8c0efaa89 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -111,6 +111,9 @@ { "name": "poutine" }, + { + "name": "queso" + }, { "name": "sashimi" }, diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/queso.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/queso.png new file mode 100644 index 0000000000..0904c57fd0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/queso.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/dead.png new file mode 100644 index 0000000000..5e8ef56941 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/harvest.png new file mode 100644 index 0000000000..abee785681 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json new file mode 100644 index 0000000000..bf2a086caa --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png new file mode 100644 index 0000000000..5033cdecc7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/seed.png new file mode 100644 index 0000000000..49b91318c2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-1.png new file mode 100644 index 0000000000..3738f191d6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-2.png new file mode 100644 index 0000000000..e6381c1c09 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-3.png new file mode 100644 index 0000000000..a5a94077a1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-4.png new file mode 100644 index 0000000000..5445d57a95 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-5.png new file mode 100644 index 0000000000..72b38c2538 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-6.png new file mode 100644 index 0000000000..de66ea6474 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/stage-6.png differ