]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7f5c11a) | patch
Tea Plant and Blue Pumpkin (#25092)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Sun, 18 Aug 2024 22:28:18 +0000 (08:28 +1000)
committerGitHub <noreply@github.com>
Sun, 18 Aug 2024 22:28:18 +0000 (16:28 -0600)
commit19526182035345c5cf8c675691666ee2c7ffa5ec
tree54b433be41adb72ac14d9218cbf7b43fc306af42tree | snapshot
parent7f5c11afaa4abc76e7e6863c66d541ab71042241commit | diff
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
36 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl diff | blob | history
Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl diff | blob | history
Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl diff | blob | history
Resources/Locale/en-US/seeds/seeds.ftl diff | blob | history
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml diff | blob | history
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml diff | blob | history
Resources/Prototypes/Flavors/flavors.yml diff | blob | history
Resources/Prototypes/Hydroponics/seeds.yml diff | blob | history
Resources/Prototypes/Reagents/Consumable/Drink/juice.yml diff | blob | history
Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml diff | blob | history
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml diff | blob | history
Resources/Prototypes/Recipes/Reactions/drinks.yml diff | blob | history
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/dead.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/harvest.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/produce.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/seed.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi/stage-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/dead.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/dried.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/harvest.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/produce.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/seed.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-4.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi/stage-5.png [new file with mode: 0644] blob
Resources/migration.yml diff | blob | history
Форк Space Station 14 с переводами на русский