git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Doru991 <75124791+Doru991@users.noreply.github.com>
	Tue, 31 Oct 2023 03:12:23 +0000 (05:12 +0200)
committer	GitHub <noreply@github.com>
	Tue, 31 Oct 2023 03:12:23 +0000 (23:12 -0400)
commit	e1440cb4931edc498d0686860fc5bbc47e65943d
tree	4a562f24290b691e0dcdaddb515eadb422cffa90	tree \| snapshot
parent	98420b5735fe288284ee39f2aff11a28d3550f0b	commit \| diff

Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)

* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)

33 files changed:

Resources/Locale/en-US/flavors/flavor-profiles.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/consumable/food/food.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/Catalog/VendingMachines/Inventories/theater.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/misc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Objects/Misc/torch.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/Food/food.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml		diff \| blob \| history
Resources/Prototypes/tags.yml		diff \| blob \| history
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png	[moved from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/equipped-HELMET.png with 100% similarity]	blob \| history
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-left.png	[moved from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-left.png with 100% similarity]	blob \| history
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-right.png	[moved from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-right.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png	[new file with mode: 0644]	blob

Форк Space Station 14 с переводами на русский

RSS Atom