From 19526182035345c5cf8c675691666ee2c7ffa5ec Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Mon, 19 Aug 2024 08:28:18 +1000 Subject: [PATCH] Tea Plant and Blue Pumpkin (#25092) * tea plant, blumpkin * fix linter * fix tests pls * bloompkin * forgor rsi * work please * WORK PLEASE * migration of the blumpkins * it is now glumpkin * lowercase * uppercase * adjust values and fix blorbo wtf when did blumpkin donut turn into blorbo donut what * fix test * update * fix stupid mistake * Update meta.json * totally not a webedit * not a webedit 2 * nitpicks --- .../Locale/en-US/flavors/flavor-profiles.ftl | 3 +- .../reagents/meta/consumable/drink/drinks.ftl | 3 + .../reagents/meta/consumable/drink/juice.ftl | 6 ++ Resources/Locale/en-US/seeds/seeds.ftl | 4 ++ .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/seeds.yml | 11 ++-- .../Objects/Consumable/Food/Baked/donut.yml | 24 +++++--- .../Objects/Consumable/Food/produce.yml | 55 +++++++++++++++++ .../Objects/Specific/Hydroponics/leaves.yml | 33 ++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 20 ++++++ Resources/Prototypes/Flavors/flavors.yml | 5 ++ Resources/Prototypes/Hydroponics/seeds.yml | 57 ++++++++++++++++++ .../Reagents/Consumable/Drink/juice.yml | 18 ++++++ .../Reagents/Consumable/Food/ingredients.yml | 17 ++++++ .../Recipes/Cooking/meal_recipes.yml | 8 +++ .../Prototypes/Recipes/Reactions/drinks.yml | 10 +++ .../Hydroponics/blue_pumpkin.rsi/dead.png | Bin 0 -> 262 bytes .../Hydroponics/blue_pumpkin.rsi/harvest.png | Bin 0 -> 336 bytes .../Hydroponics/blue_pumpkin.rsi/meta.json | 32 ++++++++++ .../Hydroponics/blue_pumpkin.rsi/produce.png | Bin 0 -> 386 bytes .../Hydroponics/blue_pumpkin.rsi/seed.png | Bin 0 -> 307 bytes .../Hydroponics/blue_pumpkin.rsi/stage-1.png | Bin 0 -> 235 bytes .../Hydroponics/blue_pumpkin.rsi/stage-2.png | Bin 0 -> 284 bytes .../Hydroponics/blue_pumpkin.rsi/stage-3.png | Bin 0 -> 305 bytes .../Hydroponics/tea_plant.rsi/dead.png | Bin 0 -> 247 bytes .../Hydroponics/tea_plant.rsi/dried.png | Bin 0 -> 273 bytes .../Hydroponics/tea_plant.rsi/harvest.png | Bin 0 -> 286 bytes .../Hydroponics/tea_plant.rsi/meta.json | 41 +++++++++++++ .../Hydroponics/tea_plant.rsi/produce.png | Bin 0 -> 334 bytes .../Hydroponics/tea_plant.rsi/seed.png | Bin 0 -> 288 bytes .../Hydroponics/tea_plant.rsi/stage-1.png | Bin 0 -> 185 bytes .../Hydroponics/tea_plant.rsi/stage-2.png | Bin 0 -> 193 bytes .../Hydroponics/tea_plant.rsi/stage-3.png | Bin 0 -> 220 bytes .../Hydroponics/tea_plant.rsi/stage-4.png | Bin 0 -> 249 bytes .../Hydroponics/tea_plant.rsi/stage-5.png | Bin 0 -> 273 bytes Resources/migration.yml | 4 ++ 36 files changed, 338 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/dried.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-4.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-5.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 39b185bd02..879bbb8812 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -112,7 +112,7 @@ flavor-complex-corn = like corn flavor-complex-banana = like bananas flavor-complex-apple = like apples flavor-complex-cotton = like cottons -flavor-complex-bungo = like bungo +flavor-complex-bungo = like tropical sweetness flavor-complex-raisins = like dried grapes flavor-complex-orange = like oranges flavor-complex-watermelon = like watermelon @@ -167,6 +167,7 @@ flavor-complex-lost-friendship = like lost friendship flavor-complex-light = like a light gone out flavor-complex-profits = like profits flavor-complex-fishops = like the dreaded fishops +flavor-complex-blue-pumpkin = like a mouthful of pool water flavor-complex-violets = like violets flavor-complex-pyrotton = like a burning mouth flavor-complex-mothballs = like mothballs diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index 359e866fd9..80a7dd7ac4 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -13,6 +13,9 @@ reagent-desc-cream-of-coconut = Sweet, syrupy version of coconut cream with adde reagent-name-cafe-latte = cafe latte reagent-desc-cafe-latte = A nice, strong and tasty beverage while you are reading. +reagent-name-tea-powder = tea powder +reagent-desc-tea-powder = Finely ground tea leaves, used for making tea. + reagent-name-green-tea = green tea reagent-desc-green-tea = Tasty green tea. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl index 3f968421d0..daa54bc3b1 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl @@ -7,6 +7,12 @@ reagent-desc-juice-banana = The raw essence of a banana. HONK. reagent-name-juice-berry = berry juice reagent-desc-juice-berry = A delicious blend of several different kinds of berries. +reagent-name-juice-blue-pumpkin = blue pumpkin juice +reagent-desc-juice-blue-pumpkin = The juice of a blue pumpkin. Smells like pool water. + +reagent-name-juice-bungo = bungo juice +reagent-desc-juice-bungo = The juice of a bungo fruit. Exotic! + reagent-name-juice-berry-poison = poison berry juice reagent-desc-juice-berry-poison = A surprisingly tasty juice blended from various kinds of very deadly and toxic berries. diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index edf9275f84..72b88ea3c5 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -32,6 +32,8 @@ seeds-potato-name = potato seeds-potato-display-name = potatoes seeds-sugarcane-name = sugarcane seeds-sugarcane-display-name = sugarcanes +seeds-teaplant-name = tea plant +seeds-teaplant-display-name = tea plants seeds-papercane-name = papercane seeds-papercane-display-name = papercanes seeds-towercap-name = tower cap @@ -120,6 +122,8 @@ seeds-pea-name = pea seeds-pea-display-name = pea vines seeds-pumpkin-name = pumpkin seeds-pumpkin-display-name = pumpkins +seeds-blue-pumpkin-name = blue pumpkin +seeds-blue-pumpkin-display-name = blue pumpkins seeds-cotton-name = cotton seeds-cotton-display-name = cotton plant seeds-pyrotton-name = pyrotton diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index e202d2482b..cf68d23dbf 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -174,7 +174,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3375 + cost: 3470 category: cargoproduct-category-name-hydroponics group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 25e41702af..d625d42743 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -5,11 +5,14 @@ AmbrosiaVulgarisSeeds: 3 AppleSeeds: 5 BananaSeeds: 5 + BerrySeeds: 5 CarrotSeeds: 5 CabbageSeeds: 5 ChanterelleSeeds: 5 ChiliSeeds: 5 + CocoaSeeds: 3 CornSeeds: 5 + CottonSeeds: 5 EggplantSeeds: 5 EggySeeds: 5 GalaxythistleSeeds: 3 @@ -17,25 +20,23 @@ GrapeSeeds: 5 LemonSeeds: 5 LimeSeeds: 5 - PineappleSeeds: 4 + PineappleSeeds: 5 LingzhiSeeds: 3 OatSeeds: 5 OnionSeeds: 5 OnionRedSeeds: 5 OrangeSeeds: 5 + PeaSeeds: 5 PoppySeeds: 3 PotatoSeeds: 5 PumpkinSeeds: 5 RiceSeeds: 5 SoybeanSeeds: 5 SugarcaneSeeds: 5 + TeaPlantSeeds: 5 TomatoSeeds: 5 TowercapSeeds: 5 WheatSeeds: 5 WatermelonSeeds: 5 - CocoaSeeds: 3 - BerrySeeds: 5 - PeaSeeds: 5 - CottonSeeds: 5 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 45164b8de6..e68c5ac8da 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -182,14 +182,18 @@ # Tastes like donut, bitterness. - type: entity - name: blorbo donut + name: blue pumpkin donut parent: FoodDonutBase - id: FoodDonutBlumpkin - description: Goes great with a mug of BLORBO. + id: FoodDonutBluePumpkin + description: Goes great with a mug of soothing drunken blue pumpkin. components: + - type: FlavorProfile + flavors: + - sweet + - bluepumpkin - type: Sprite state: blue -# Tastes like donut, blorbo. +# Tastes like donut, blue pumpkin. - type: entity name: bungo donut @@ -352,11 +356,15 @@ # Tastes like jelly-donut, bitterness. - type: entity - name: blumpkin jelly-donut + name: blue pumpkin jelly-donut parent: FoodDonutBase - id: FoodDonutJellyBlumpkin - description: Goes great with a mug of soothing drunken blumpkin. + id: FoodDonutJellyBluePumpkin + description: Goes great with a mug of soothing drunken blue pumpkin. components: + - type: FlavorProfile + flavors: + - sweet + - bluepumpkin - type: Sprite state: jelly-blue - type: SolutionContainerManager @@ -371,7 +379,7 @@ - type: Tag tags: - Fruit -# Tastes like jelly-donut, blumpkin. +# Tastes like jelly-donut, blue pumpkin. - type: entity name: bungo jelly-donut diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index d8234a5bfb..23c22e3bef 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2332,6 +2332,11 @@ sprite: Objects/Specific/Hydroponics/bungo.rsi - type: Produce seedId: bungo + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceBungo + Quantity: 10 - type: Tag tags: - Fruit @@ -2457,6 +2462,56 @@ - Fruit - Vegetable +- type: entity + name: blue pumpkin + parent: FoodProduceBase + id: FoodBluePumpkin + description: A large, blue... berry. Seriously. + components: + - type: Item + size: Small + - type: FlavorProfile + flavors: + - bluepumpkin + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Ammonia + Quantity: 10 + - ReagentId: Chlorine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceBluePumpkin + Quantity: 10 + - type: Sprite + sprite: Objects/Specific/Hydroponics/blue_pumpkin.rsi + - type: Produce + seedId: bluePumpkin + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 16 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Fruit + - type: entity name: cotton boll description: Moth people's favorite snack, and just as fluffy as them. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index 6fb0ac9566..92ab8d577c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -179,6 +179,39 @@ graph: smokeableGroundCannabisRainbow node: groundRainbow +- type: entity + name: tea leaves + parent: ProduceBase + id: LeavesTea + description: "Can be dried out to make tea." + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/tea_plant.rsi + - type: Produce + seedId: teaPlant + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Vitamin + Quantity: 2 + +- type: entity + name: dried tea leaves + parent: ProduceBase + id: LeavesTeaDried + description: "Dried tea leaves, ready to be ground." + components: + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: TeaPowder + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/tea_plant.rsi + state: dried + - type: entity name: tobacco leaves parent: ProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 65f7988be0..c9c372e277 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -163,6 +163,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/sugarcane.rsi +- type: entity + parent: SeedBase + name: packet of tea plant seeds + id: TeaPlantSeeds + components: + - type: Seed + seedId: teaPlant + - type: Sprite + sprite: Objects/Specific/Hydroponics/tea_plant.rsi + - type: entity parent: SeedBase name: packet of papercane seeds @@ -614,6 +624,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/pumpkin.rsi +- type: entity + parent: SeedBase + name: packet of blue pumpkin seeds + id: BluePumpkinSeeds + components: + - type: Seed + seedId: bluePumpkin + - type: Sprite + sprite: Objects/Specific/Hydroponics/blue_pumpkin.rsi + - type: entity parent: SeedBase name: packet of cotton seeds diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 46dd2939bb..44966e32a7 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1084,6 +1084,11 @@ flavorType: Complex description: flavor-complex-fishops +- type: flavor + id: bluepumpkin + flavorType: Complex + description: flavor-complex-blue-pumpkin + - type: flavor id: violets flavorType: Complex diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 86bce962b8..bff2c019c1 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -357,6 +357,31 @@ Max: 5 PotencyDivisor: 5 +- type: seed + id: teaPlant + name: seeds-teaplant-name + noun: seeds-noun-seeds + displayName: seeds-teaplant-display-name + plantRsi: Objects/Specific/Hydroponics/tea_plant.rsi + packetPrototype: TeaPlantSeeds + productPrototypes: + - LeavesTea + harvestRepeat: Repeat + lifespan: 75 + maturation: 5 + production: 3 + yield: 2 + potency: 20 + growthStages: 5 + waterConsumption: 0.6 + idealLight: 9 + idealHeat: 298 + chemicals: + Vitamin: + Min: 1 + Max: 5 + PotencyDivisor: 20 + - type: seed id: papercane name: seeds-papercane-name @@ -1674,6 +1699,8 @@ packetPrototype: PumpkinSeeds productPrototypes: - FoodPumpkin + mutationPrototypes: + - bluePumpkin lifespan: 55 maturation: 10 production: 4 @@ -1691,6 +1718,36 @@ Max: 5 PotencyDivisor: 20 +- type: seed + id: bluePumpkin + name: seeds-blue-pumpkin-name + noun: seeds-noun-seeds + displayName: seeds-blue-pumpkin-display-name + plantRsi: Objects/Specific/Hydroponics/blue_pumpkin.rsi + packetPrototype: BluePumpkinSeeds + productPrototypes: + - FoodBluePumpkin + lifespan: 55 + maturation: 10 + production: 4 + yield: 2 + potency: 10 + idealHeat: 288 + growthStages: 3 + chemicals: + Ammonia: + Min: 1 + Max: 15 + PotencyDivisor: 3 + Chlorine: + Min: 1 + Max: 5 + PotencyDivisor: 5 + Vitamin: + Min: 1 + Max: 10 + PotencyDivisor: 3 + - type: seed id: cotton name: seeds-cotton-name diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index c42791fa8f..b9baf395d3 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -26,6 +26,24 @@ flavor: berry color: "#660099" +- type: reagent + id: JuiceBluePumpkin + name: reagent-name-juice-blue-pumpkin + parent: BaseJuice + desc: reagent-desc-juice-blue-pumpkin + physicalDesc: reagent-physical-desc-strong-smelling + flavor: bluepumpkin + color: "#00BFFF" + +- type: reagent + id: JuiceBungo + name: reagent-name-juice-bungo + parent: BaseJuice + desc: reagent-desc-juice-bungo + physicalDesc: reagent-physical-desc-tart + flavor: bungo + color: "#F9E43D" + - type: reagent id: JuiceCarrot name: reagent-name-juice-carrot diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index da6059dcd0..d6f6305539 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -257,3 +257,20 @@ - !type:AdjustReagent reagent: Nutriment amount: 0.75 + +- type: reagent + id: TeaPowder + name: reagent-name-tea-powder + desc: reagent-desc-tea-powder + physicalDesc: reagent-physical-desc-powdery + flavor: tea + color: "#7F8400" + group: Foods + metabolisms: + Food: + effects: + - !type:SatiateThirst + factor: -0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 287f15ad0f..9a59ab5023 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1718,6 +1718,14 @@ # NOT ACTUAL FOOD +- type: microwaveMealRecipe + id: RecipeDriedTeaLeaves + name: dried tea leaves recipe + result: LeavesTeaDried + time: 10 + solids: + LeavesTea: 1 + - type: microwaveMealRecipe id: RecipeDriedTobacco name: dried tobacco leaves recipe diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 96cc5b6aaa..67a5b54f81 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -983,6 +983,16 @@ products: SyndicateBomb: 2 +- type: reaction + id: Tea + reactants: + TeaPowder: + amount: 1 + Water: + amount: 5 + products: + Tea: 6 + - type: reaction id: TequilaSunrise reactants: diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..e66da2064ae4476a201e023ac3d9a6edcf138670 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUdy>6Rub;PLV)ef60+5E(jfa60Ye|q_@P8m+_`QuU7%0G5;1OBO zz`%D9gc)~C%zg_L%=dJ046*Qkd%=^h!GMSPfW_JW_j@jzYAUSrc;M`M_odPixlhg0 z%$qK^1uWo;+8?ggpmqI=T!lrTzCZ-izC%szYps}tTNO(sIs6-@Tv|Sl#lhj=^HXn> xACyh3`(NYA@b=xt@(zY?_7{W>l-e<#;X81f-*%cSQzOu722WQ%mvv4FO#t%z+epNswRge=uN>@@94e z3UL;AL>4nJ@ErhQ#;j|doIt^io-U3d7XEK1+!ks!;BeXL^6&rT-Q0nTuDzh-6%|z%*@zGYe#l zE$VYzPMs7jx?elgH)+>xIZ$49U!wZNISDy!h^Lg!{xt WkvU6F+Is>W&*16m=d#Wzp$PzQV}8#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json new file mode 100644 index 0000000000..118139ebe5 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/5d507cfbad6f73d1beaba66d93f31f893adb3a84, modified by potato1234_x (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..8e203782132faeb5d8da92835bfbb0b3c8ef95b6 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUEsLBji`+aq{nUbtjIs}@8%#G$vT<2(FXhDzWz{;Ms*U#Cfk2A8 zB*-uLKO8W4`7?e33Ud~CL>4nJ@ErzW#^d=bQh{g_1WR>AMZbE8*(yRo0i#Cll7`He{_$-x})`I$fP1 znwPsFN@mwZMh}s#C-lDPCo!p;=(=`w%xv7tcyqA<-!Ge6ya(QXNH+M_#QR)T&|%-I zc@q}Tel6NyW3)hpO`!SabjvB*7%CFZ&1F~`zChgTI*X8ulv~n|>>t_!{E|y&u4U+8 zvuxB@`5d0E6udr8b}hXMsm#F#`kNVGw3Kp1&dmC|Kj^;uvD#|Mq;KP_qJ0 zOX8-j8#%t)=SRBSEK90ptdE=VL|P{J?`7U^EGpK0y_~@e)nAxJe|2to<9JkkgWOSx zT1Mt<6}DVH8|$464eQrm^?X)w?}x*^n$tB(EV+R;)jwGSjJ_L6{6Fx9>C7~ajtP64 kW}Q3M@Y41T+nQ_U;%77s)bj6e0Nugh>FVdQ&MBb@01w4-6aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..762e986ae9263c5192b97c0d9995dc7839c358bf GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?STw_aG0GRbfH-WH(1yj0n9Aax}{e!>6$|7UQ}TKNUY=PdAuEM{Qf zI|#yzJ0@no1qw!Zx;Tbd_`f|D$i<+@!4e?*zW%vv_+6f;U;S)~MRF5wsENDyu`WuR zbBg7jZR6}y43nxIHnQzpZ+w}-L~rlA1NYP1%_p)g5@|3#!T!T}-QG`SjQ@%nkH29Q X`p-RCFsMBeXa|F*tDnm{r-UW|3bsw+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..22f418d5712bcafc09edf1a9843e1987fdda9dd2 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?STw_aG0GRbfH-WH(1yj0n9Aax}{e!>6$|7UQ}TKNUY=PdAuEM{Qf zI|#yzJ0@no1qyb0x;Tbd_`jVH$aTPg!@2j~|8w3US=`Nk^EO-vy_n9sx#9xs%a(umIDZ9*(#7}gTe~DWM4f6y9Zm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..eb08406899497d229313d04f3d13d55069ed1f7d GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?STw_aG0GRbfH-WH(1yj0n9Aax}{e!>6$|7UQ}TKNUY=PdAuEM{Qf zI|#yzJ0@no1*!FPaSXBWe>=gO?}!11Gv}TE=aS#lc-&ewdt#b#Sai@ICKWOLU(A=p z88=@G-!1ll&&i*qe#Ipw%fqv$-DhAkEf&-IcTH*S8b$}+nc*IleJA&HF5_Yl=KGXw z9l|JZR`=WIYl<5MMf-kBFkG(eY56cSg#C%~{i^?#t}`9C9^`52X8pi0Wzp&gRI$xL>@x!dh|RePajzB~GrpFVMg}Nz17^=lp0r$GlLb zRP~zE2DVc1;{}sgbyz)pHO!Y!RY^H`-a~5o1I{m^2OpjAvFcdxLg;h&*E330wa`xrc3{an^LB{Ts5*i=!w literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/dried.png b/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/dried.png new file mode 100644 index 0000000000000000000000000000000000000000..5cb5ff893e06addb2cfdbe20437d623a59d28603 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbU<*Yf?ytuW3co>WstcwL(`$d5=Yc;=c11a{BAiv=MV89^d&Flsg z;w(G#V^^mJxUIpumEeo(tyf+jgYUx1MW>FayvQwB>>ikw zq$S+)E;-npHGE;V%>PR9mTL{YuJ4+7J`37&q}M5Y*~c7jELJ<|(-BUf?F^o-elF{r G5}E*R4PEL0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..438c94fed367822d14d9512679b3379b4144c886 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbU6&5NuJabT3tDvw=L7`BACmATg@H+d92asYf3Gxg64+acU-pp=5 zA;{VFgGGaBRg_hkjr_bov zvnAu_q4*yk6eNB9ZC&zEqVX zm5p2iXx(g?0&e)~2p?CNB)yvp!b06q!s=TUb;C!%8b4IfB4eMTa z2J_SU7g=|#IvBmA&}jb|pOama6JFa(y=3}({na$R8_fRc6({&PZhvD6xGeL3hMJQ< P(8&y*u6{1-oD!ManMpkS@1i(`m||J(C{LPvm32sjzG=YQ|)714$5W%?I> zJU$@Ye(B#6R%J$!-*U4>Rhe!qmv<4|uW_7X(T&Eh9%nA`8!UKbX+Lu*?}ol8%>wot zQVbDKOCK|oGnMywFmlZK%f3MH)pG~yFS=XY`NH~mSOk9wZYfF?n^NKbnQ7@(;k``~ Vy&G2lS`TyxgQu&X%Q~loCIE>WW+4Co literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3a3183b27d835a4a574dd9415ef98ab31030af94 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pr5CUV@QPi+lw1{fkv@jTt9i&B58vz=7^mQ zWIWg8%ascDI@&%zqlZMnvJarQk#r+sI^| UGjmM(SAo=dy85}Sb4q9e09vs(eEanMprDbbi(`m|e{zBngPW+sfe#@K3maWndw5!W7*;t5J6=C{fFt$50S1i(l_danMprEg(i(`m||J#0VE}(U+SAWY})$4|697#RvRAsb+G4@B(Me(A=Pj)u^yHUb2 z;p1`66I>o2*BlXDR$;K{0NXNI&l!K6W^(^LrX(^?phN7pAp36rlCLsAgBd(s{an^L HB{Ts5GHyfk literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d418ceb6df6cf9abe5ab3ccc4ef53213ec772ad7 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?ST6&5Ne6e{o}1NjWsCgeT@sVfQc3;zHAKZAqT$}d1ZXMsm#F#`kN zVGw3Kp1&dmD46Ey;uvD#|MvVrz6J#z<_l%N|JQG8YReVaQ+Y8?h7nt@5YMo@el=#M=$z-FcMLt)@lKF0HdM}=u!l^Mk l{>vVQS3SZrK5;&%W9W|K&e=G5*<_%N44$rjF6*2UngA9CRUiNW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-5.png new file mode 100644 index 0000000000000000000000000000000000000000..2789d5dea1efe6aea34ea6485ccd0c180b3b4793 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?ST6&5NetW{9hrl3%$z>^FVWstZ0*bSuEN`m}?|APR-=KV|d14TFs zJR*x382Ao@Fyrz36)8Z$GEW!B5DWjeeV%-W4S1M6b^re_S{cG_8QpKI!ooA-QH0v3 z_P7VDg%f1g_IXI0+_scaW5L07jZQpyPPeABF+5#U@r=2Ff#ZhX`6Y#4*B|v!qv!GuUw|%P@O1Ta JS?83{1OO!gUpfE) literal 0 HcmV?d00001 diff --git a/Resources/migration.yml b/Resources/migration.yml index c533e11bf4..7de70260f7 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -212,6 +212,10 @@ VehicleJanicartDestroyed: null YellowOxygenTank: OxygenTank YellowOxygenTankFilled: OxygenTankFilled +# 2024-02-12 +FoodDonutBlumpkin: FoodDonutBluePumpkin +FoodDonutJellyBlumpkin: FoodDonutJellyBluePumpkin + # 2024-02-19 Drone: null SpawnMobDrone: null -- 2.51.2