Tayrtahn
29cdb9cf4e
Add fill level sprites for all the drinks ( #25319 )
...
* Fill levels for cuba libre
* Absinthe glass
* Acid Spit
* Ale glass
* Devil's kiss
* Doctor's delight (ugghh)
* Blue Curacao and Emerald Liquor glasses
* Allies cocktail, Martini, Vodka martini, Driest martini, Gildlager glass, Manhattan, Manhattan Project, Patron glass
* Aloe, Amasec, Andalusia, Antifreeze, Atomic Bomb
* Barefoot, B-52, Bahama Mama, Banana Honk, Beepsky Smash, Beer glass, Berry juice, Blood glass, Bloody Mary, Booger, Brave Bull, White Russian
* Whiskey Soda, Whiskey glass, Whiskey Cola, Vermouth glass, Tequila glass
* Cognac glass, Demon's Blood, Erika Surprise, Gargle Blaster, Gin Fizz, Gin & Tonic
* Grog glass, Hippies' Delight, Iced Beer, Irish Car Bomb, Irish Cream glass, Irish coffee
* Long Island Iced Tea, Manly Dorf, Margarita, Mead
* Merge beer steins
* More merging
* Tintable Demon's Blood, Absinthe, Barefoot, Bahama Mama, Beer, Bloody Mary, Booger, Devil's Kiss, Patron
* Sbiten, Coffee Liqueur, Cogchamp, Screwdriver, Rewriter
* Vodka glass, Gin Vodka glass, Wine glass, NT Cahors glass, Poison Wine glass, Rum glass, Dead Rum, Champagne
* Black Russian, Mojito, Neurotoxin, Silencer, Sui Dream, Snow White, Syndicate Bomb, Tequila Sunrise, The Martinez, Three Mile Island
* Green tea, Iced green tea, Iced tea, Grenadine, Iced coffee, Lemonade, Kira Special
* Cafe latte, Soy latte, Nuclear Cola, Singulo, Toxins Special, Vodka Tonic, Ice cream, Rootbeer, Rootbeer float
* Removed rogue pixel in Manhattan fill sprite.
2024-02-20 23:17:56 -07:00
Sybil
64cecdde84
add icons for drinks in Solar's ( #25301 )
...
* add icons for drinks in Solar's
fixed colors of tea
* consistently use capitals for color codes
* don't add extra whitespace
2024-02-19 10:40:43 -05: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
RumiTiger
b80b6c04b2
A beer can and a wine can ( #24365 )
...
* A beer can and a wine can
* fix wrong file locations
Signed-off-by: c4llv07e <kseandi@gmail.com >
* Update drinks_cans.yml
* A beer can and a wine can
* Update drinks_cans.yml
* A beer can and a wine can
* replace sprites
Signed-off-by: c4llv07e <kseandi@gmail.com >
* Update meta.json
* Update meta.json
* Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json
* Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json
---------
Signed-off-by: c4llv07e <kseandi@gmail.com >
Co-authored-by: c4llv07e <kseandi@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-02-01 17:41:23 +11: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
Hanz
8fc9650b6e
Bartender limited reagents fixup ( #24598 )
...
Fixed up bartending after the limited reagents update
2024-01-27 09:49:26 -08: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
cool dolphin
a34ee7c300
Add delicious mopwata ( #23740 )
...
* added delicious mopwata
* added mopwata, the reagent
* fixed issues, changed color, added more possible fills
2024-01-08 19:24:32 -07:00
Ubaser
172fcaf2d4
Rename Goldschläger to Gildlager ( #23223 )
...
* add
* fix
* catalog
* migration
* conflicts..
* uh
* test
* m
* fix fr
* line?
* beg
* suffering
* um
* fix
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-01-07 02:34:15 +11:00
Velcroboy
a4ed13af4a
Remove duplicate milks ( #22721 )
...
* Remove duplicate milks
* Migration
* Inventories
* Guidebook
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com >
2023-12-18 15:51:39 -07:00
themias
e7de7fa075
Add fill layers to Hot Cocoa drink ( #22419 )
2023-12-12 17:01:24 -07:00
IProduceWidgets
b279f5c910
Jar now fills ( #22384 )
...
* Jar
* jar rsi
2023-12-12 00:54:15 -07:00
Ubaser
de601208ea
Add metamorphic "Blood" sprite ( #21596 )
...
* add
* forgot to remove
* maybe fix
2023-11-28 00:09:55 -07:00
SpaceCat
fc4c964e61
adds champagne ( #18344 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-07-28 17:54:36 +02:00
OctoRocket
0d2bf9d23c
[Add] Adds HoS Flask ( #18268 )
...
* [Add] Adds HoS fask
* Added flask base
2023-07-27 13:41:33 -06:00
potato1234_x
ee8407f8c3
nukie drink more like, uh, cringe ( #18349 )
2023-07-26 20:17:22 -06:00
Jessetriesagain
9a12aade93
Simple Tweak to Ale Sprite to look more like a type of Ale ( #17757 )
...
Co-authored-by: Jessepretendstocode <j14527998@gmail.com >
2023-07-03 15:34:26 -06:00
Slava0135
9c976d517e
Add space lube tube ( #17387 )
2023-06-27 22:48:06 -04:00
Slava0135
e554958be6
Add space glue tube ( #16600 )
2023-05-20 12:42:38 +10:00
Jackal298
ed05998f4c
Changeling Sting Sprites Update ( #16620 )
...
I updated the sprites for the changeling sting
2023-05-19 14:11:25 -06:00
deltanedas
22088f693b
manly dorf is now like oily oaf ( #16349 )
2023-05-13 08:14:56 -04:00
Floofi
982ab015f3
The Martinez drink from cyberpunk 2077 ( #15421 )
...
* added 'The Martinez' drink made with 1 ice, 1 lemon juice, 2 vodka, and 2 cola
---------
2023-05-03 18:23:43 -04:00
keronshb
0f7e7da450
Ratvarian Language and CogChamp ( #15639 )
2023-04-29 18:34:19 +10:00
Puro
4443850de3
[Drink] Robust nukie drink ( #15051 )
...
* [Drink] Robust nukie drink
only syndie.
* [desc]grammar fix
* [Meta] newline at the end
2023-04-03 00:42:37 -06:00
potato1234_x
51778afe6f
TG Vending Machines + Tweaks ( #14703 )
...
* d
d
* engivend misalignment
* sustenance vendor
* Revert "sustenance vendor"
This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.
* shamblers juice
* pwrgame
* most food/drink machines
* robotech deluxe, centdrobe and some restock boxes
* copyright + salv vend
* tweaks
* restock box + more tweaks
* yaml linter fail
* divide vendor contents
* divide contents 2
2023-03-24 02:54:47 -06:00
adamsong
980c3ef799
Improved solution container visuals ( #13791 )
2023-03-23 14:49:42 +11: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
f21534eefa
Vinegar, Mayonnaise, Ketchunaise ( #13288 )
2023-01-20 05:46:42 -08:00
Jackrost
78deed3925
Singulo drink - speed up animation ( #13484 )
2023-01-15 09:01:14 -04:00
Nemanja
f80cd98c92
mug solution level visuals ( #13251 )
2023-01-07 19:09:33 -08:00
Mervill
07da6ba416
Rename Kahlua to Coffee Liqueur ( #12525 )
...
Closes https://github.com/space-wizards/space-station-14/issues/10486
2022-11-16 12:59:43 -08:00
lapatison
d5f562648b
Opened soda can texture fix ( #11420 )
2022-09-19 16:47:45 -07:00
themias
d36a58dd2e
Add visualizer to hot coffee and tea ( #11211 )
2022-09-11 20:53:48 -07:00
lapatison
f94e3743b2
Centered shot glass sprite ( #9986 )
2022-07-23 18:47:02 -07:00
KIBORG04
71c8d08e4c
Kvass ( #9082 )
...
* add kvass
* nevermind
* forgot about double 's'
* Update tanks.yml
* gotovo
* Update meta.json
2022-07-11 23:11:12 -07:00
ZeroDayDaemon
a8937db9e1
Funny dog mug ( #8224 )
2022-05-18 11:21:38 -07:00
EmoGarbage404
d953f88530
MRE boxes ( #7726 )
2022-04-30 14:24:37 -07:00
Peptide90
ef04d6f513
remove redbull and brown ale copyright ( #6801 )
2022-02-19 18:07:18 -07:00
Peptide90
7de1953c4c
replaced nuka cola with nuclear cola ( #6379 )
2022-01-30 18:10:15 +11:00
Plasmaguy
cee179d078
Root beer, ice cream, and root beer floats ( #6334 )
2022-01-27 18:33:27 +11:00
Peptide90
5d15787b04
Copyright purge ( #5788 )
2021-12-15 13:43:12 +11:00
Mith-randalf
4ed0b57ea6
Adds open icon for tonic water ( #5502 )
2021-11-25 12:35:01 +11:00
ZeroDayDaemon
293186b563
Bartending Content & Bug Fixes ( #5038 )
2021-10-31 14:57:05 +01:00
Galactic Chimp
61f1c8a05c
#3898 open sprite field for drink comp ( #4235 )
...
* temp
* #3898 some progress on DrinkCanVisualizer
* Fixed implementation
* Moved drink can sprite layer definition to abstract parent
* Added open drink can sprites
* #3898 - fixes for drink cans' sprite field after merge + moved UpdateAppeareance from DrinkComponent to DrinkSystem
* Update Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
* #3898 removed obsolete comment
Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com >
2021-10-03 15:56:29 +11:00
Swept
465eaa87d3
Deprecates DrinkFoodVisualizer.cs in favor of SolutionContainerVisualizer.cs ( #3876 )
...
* Initial
* Removes DrinkFoodVisualizer.cs
* Tests
2021-04-21 21:12:37 +00: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
Swept
0163f2af09
Firey rags are not fucking drinks ( #2037 )
2020-09-13 14:07:26 +02:00
Swept
c7037c2293
Fixes a ton of sprite icons. ( #2034 )
...
* Icons + Sprites for Atmos pipes
* Fixes Mimic icon
* Fixes rsi for RnD point source
* RnD Point source prototype fix
* Centers Bike Horn icon
* Centers pirate hat sprite
* Centers a bunch of milkshake icons
* Moves light_bulb.yml to Constructibles
* Fixes light_tube icons
* Emergency Light icon fix
* Medical Scanner icon
* ID Rsi fixed
* ID cards now have proper icons
* Lockers have proper icons finally
* Default Icon Fixed
* Resolved lighting issues
2020-09-13 13:53:47 +02: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
