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	RumiTiger <154005209+RumiTiger@users.noreply.github.com>
	Sun, 28 Apr 2024 04:43:45 +0000 (01:43 -0300)
committer	GitHub <noreply@github.com>
	Sun, 28 Apr 2024 04:43:45 +0000 (14:43 +1000)
commit	f5b8b5fbdcb4675cd29d15e2cd4112e587b03034
tree	84fc07e468e2a458175b947ba73d4bf743146184	tree \| snapshot
parent	f88b6f6154c47c14cfe2d13edd669ad550a48a3f	commit \| diff

Sprites for drinks without sprite (attempt 2) (#27227)

* A beer can and a wine can

* fix wrong file locations

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

130 files changed:

Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/juice.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Food/food.yml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coffeeglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/colaglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/dr_gibb_glass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/greenteaglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/icedgreenteaglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/iceglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/iceglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/iceglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/iceglass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/iceglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/iceglass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/lemonjuiceglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/fill-6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/moonshineglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/orangejuiceglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/fill-6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space-up_glass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_glass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/fill-7.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sugarglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/teaglass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-1.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-2.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-3.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/icon_empty.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonicglass.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/watermelonglass.rsi/meta.json	[new file with mode: 0644]	blob

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

RSS Atom