]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8812237) | patch
Add Cotton Burgers (#36405)
authorWolfkey-SomeoneElseTookMyUsername <wolfkey75@gmail.com>
Sat, 26 Apr 2025 01:54:14 +0000 (20:54 -0500)
committerGitHub <noreply@github.com>
Sat, 26 Apr 2025 01:54:14 +0000 (18:54 -0700)
commit0dd9ffe8bffecbb7570c842dfe46d0f318a7ec17
tree8d591b9daab5ae553c4a79e7e0b7c831b818dd2dtree | snapshot
parent8812237108a194b0fdc9bacc1f28774d6e3a1f79commit | diff
Add Cotton Burgers (#36405)

* Adds cotton burgers

* Rephrased copyright

* Added an extra comment

* Adds CottonBurger to tags.yml, Not sure if i am supposed to do this or not.

* Reordered Cotton bun YAML, and fixed overwritten tags

* Merge issue fix?

* Add experiment plushie and remove rubber chicken from cotton burgers

* Minor comment change

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
13 files changed:
Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs diff | blob | history
Resources/Locale/en-US/nutrition/components/food-sequence.ftl diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml [new file with mode: 0644] blob
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Fun/toys.yml diff | blob | history
Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml diff | blob | history
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml diff | blob | history
Resources/Prototypes/tags.yml diff | blob | history
Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_bottom.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/cottonbun_top.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Food/cottonburger.rsi/meta.json [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский