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	Tiniest Shark <head.rebel@yahoo.com>
	Wed, 3 Sep 2025 19:21:00 +0000 (15:21 -0400)
committer	GitHub <noreply@github.com>
	Wed, 3 Sep 2025 19:21:00 +0000 (15:21 -0400)
commit	3aeecd0139c794408a5434091609077b106c53b1
tree	312f9e8861b10ce4126508d3553ec782633576aa	tree \| snapshot
parent	15f3381bc31b2a0be82c7ef448d25ca9ec1b148c	commit \| diff

Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814)

* Added inhand sprites to cans, cartons and cups.

* small tweak

126 files changed:

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lean.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Misc/6pack.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Misc/6pack.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Misc/6pack.rsi/meta.json		diff \| blob \| history

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

RSS Atom