Commit Graph

7 Commits

Author SHA1 Message Date
Tiniest Shark
88ebad06ea Bottle Drink Inhands (#38937)
* there is now bottles of booze in your hands

* Messed up the vermouth inhand fills slightly.

* oh whoops that's redundant
2025-07-12 10:28:22 -04:00
Prole
6cdc436f5f 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>
2025-05-06 14:13:33 -04:00
Tayrtahn
41cf3e5599 Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.
2024-02-04 12:13:47 -08:00
Tayrtahn
cebb20d535 Add fill level visuals for water bottle in-hand sprites (#24708)
Fill level visuals for water bottle inhands
2024-01-29 16:19:55 -07:00
themias
6931848f1d Add fill visuals and inhand sprites to water bottle (#24240)
* Add fill visuals and inhand sprites to water bottle

* adjust sprite
2024-01-18 16:55:05 -05:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00