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

author	Prole <172158352+Prole0@users.noreply.github.com>
	Tue, 6 May 2025 18:13:33 +0000 (11:13 -0700)
committer	GitHub <noreply@github.com>
	Tue, 6 May 2025 18:13:33 +0000 (14:13 -0400)
commit	6cdc436f5f8fd2a375ef23e06de448cf93d43dc9
tree	2bb1028f0c7da050a00dafcd62ef1a882b4e9707	tree \| snapshot
parent	62984fc3097cbbeb3bc7bf09a4144ef88ffc5386	commit \| diff

Water bottle dispenser fix & Bottle Yaml Organizing (#37108)

* A New Parent/Category For The Soda & Tonic Water Bottle

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* New Parent For water bottle & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* More Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Details

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Organizing For Additions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Streamlining waterbottle to be compatible with DrinkBottleVisualsAll Parent

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Replacing/Renaming Parents

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* New Tonic/Soda Water Bottle Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Misc Fixes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* New Parent for Small Glass Bottles & Organizing

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Organizing & uSize Parity.

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* File Parity

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Merged Categories & Misc Fixes

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Removed Silly

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Parent Name Parity & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Large Glass Bottles Category & Cleanup

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-1.png	[moved from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-1.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-2.png	[moved from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-2.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-3.png	[moved from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-3.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-4.png	[moved from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-4.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/fill-5.png	[moved from Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon-5.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json		diff \| blob \| history