Commit Graph

6 Commits

Author SHA1 Message Date
āda
ceedfb6d39 Standardize state names in drinks yml (#40316)
* drinks_base

* drinks_special

* drinks_fun

* drinks_cans - the holy minus diff

* bottles_glass and metamorphic

* mugs

* Solar's Best Hot Drinks

* misc drinks_cups

* slight addition to base

* lint fix

* metamorphic glass

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-10-07 16:05:30 +00:00
Tiniest Shark
214338caa6 Inhands for bartender tools and mugs. (#37771) 2025-05-24 13:32:27 -04:00
Moony
cc0c516e02 Improves bartending with some tweaks. (#14169)
* Improves bartending with some tweaks.
- Glasses got resprited and now support fill levels.
-

* New glass type and improve shotglass visuals.

* oobsy

* fixes

* get flasked

* flask

* flask

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-02-18 19:00:31 -06:00
lapatison
f94e3743b2 Centered shot glass sprite (#9986) 2022-07-23 18:47:02 -07: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