]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9cb3287) | patch
Rainbow Weed (#25759)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Mon, 29 Apr 2024 04:06:27 +0000 (14:06 +1000)
committerGitHub <noreply@github.com>
Mon, 29 Apr 2024 04:06:27 +0000 (21:06 -0700)
commitcd90c05ce58d0b8ce48c3ea4fcf960ecc89b88ae
tree1164f467fafe8d90a713968cf785e3f9f5e3dc99tree | snapshot
parent9cb3287de4225eda4debca77c37fdb6602dad5adcommit | diff
Rainbow Weed (#25759)

* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents
22 files changed:
Resources/Locale/en-US/reagents/meta/fun.ftl diff | blob | history
Resources/Locale/en-US/seeds/seeds.ftl diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.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/Hydroponics/seeds.yml diff | blob | history
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml diff | blob | history
Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml diff | blob | history
Resources/Prototypes/Recipes/Crafting/smokeables.yml diff | blob | history
Resources/Prototypes/Recipes/Reactions/medicine.yml diff | blob | history
Resources/Prototypes/Stacks/consumable_stacks.yml diff | blob | history
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/dead.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/dried.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/harvest.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/powderpile_rainbow.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/produce.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/seed.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/stage-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/stage-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi/stage-3.png [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский