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	ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
	Fri, 16 Jan 2026 00:19:42 +0000 (01:19 +0100)
committer	GitHub <noreply@github.com>
	Fri, 16 Jan 2026 00:19:42 +0000 (00:19 +0000)
commit	897a2d40bc2ec2ba595f6a60f64b12f0b5304010
tree	207391030240a0ad7320a95eb577bf31a58b1755	tree \| snapshot
parent	6df3ed9682b2e545b77342ddd21a80d07f45d928	commit \| diff

Add Mortar and Handheld Juicer (#42019)

* init

* API

* testing

* review

* return

* good enough, fix later

TODO:
Proper prototype
DoAfter
Sounds

* "proper" prototype

TODO
DoAfter
Sprite

* proper protos, mortar sprite

* juicer sprites

TODO:
Juicer sounds
Makeshift crafting recipes
Add regular to vendors

* sprite tweak

* juicing sound, cleanup, construction

* vendors

* line end

* attribution newline

* small balance tweak

* Let it be known id never webedit

* meta

* item size

* review

* handhelds

* partial review

* cache solution, looping

* graph

* review

* popup

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>

42 files changed:

Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs		diff \| blob \| history
Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Kitchen/Components/HandheldGrinderComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs		diff \| blob \| history
Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs		diff \| blob \| history
Resources/Audio/Items/Culinary/attributions.yml	[new file with mode: 0644]	blob
Resources/Audio/Items/Culinary/juicer_juicing.ogg	[new file with mode: 0644]	blob
Resources/Audio/Items/Culinary/mortar_grinding.ogg	[new file with mode: 0644]	blob
Resources/Locale/en-US/kitchen/components/handheld-grinder.ftl	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Kitchen/equipment.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Recipes/Construction/tools.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/handheld_grinders.yml	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/cap.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/juicer_base.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_base.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/makeshift_icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/handheld_juicer.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_base.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/makeshift_icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/mortar_base.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Kitchen/mortar_and_pestle.rsi/pestle.png	[new file with mode: 0644]	blob

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

RSS Atom