38 Commits

Author SHA1 Message Date
SeepingVisage d7aa6a9440 yeah this fixes the shotglass overlay and makes a stylistic change 2024-09-16 21:08:09 -04:00
Orotheim a603387146 Updates Red Mead sprite 2024-09-14 23:11:47 +01:00
Orotheim b9f4504786 Adds icon files for modern TG drinks 2024-08-26 19:31:36 +01:00
Orotheim 5c11613e33 Fixes drink bugs
Adds in missing Long Island Iced Tea sprite. 
Adds missing pudding and cherry shake sprites.
Fixes misplaced glass_overlay
2024-08-26 17:56:35 +01:00
evilew 77ae608737 noms' updates tea and mojito 2024-08-21 16:36:55 +02:00
Orotheim aa07a277f7 Ports TG's drink sprites
They look amazing.
2024-08-21 13:41:22 +01:00
PatrickLeeJohnson 6ea01f0138 milkshakes
vanilla and chocolate

GOOD
2024-08-19 04:38:44 +03:00
Alphas00 d53f3a1569 Beltbuster Mead, new drinks Datapad
-Added Beltbuster Mead and its recipe
-Added beltbuster_mead sprite to drinks.dmi
-Added datapad for the new drinks to lore_papers.dm
-Moved new drinks to their separate file, fatty_drinks.dm
-Moved new drinks recipes to their separate file, fatdrinks.dm
-Included fatty_drinks.dm and fatdrinks.dm into tgstation.dme
2023-12-22 17:02:07 +01:00
Alphas00 694c3d21cb Drink Tweaks
Updated sprites, fixed drink colors, spelling and name in the Fruits Tea reaction
2023-12-21 16:36:55 +01:00
Alphas00 99262546f5 Adding fattening drinks
Adding 5 drinks for bartenders to make to help the job interact more with the fatness system.
Added are: belly bloats, blobby mary, heavy cafe, fruits tea, snakebite
2023-12-20 21:52:46 +01:00
eyespy 9f91af7742 For karl! 2023-04-04 16:03:42 +10:00
eyespy 29756d756b Revert "Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!""
This reverts commit 544605fca6.
2023-02-16 18:03:22 +11:00
eyespy 544605fca6 Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!"
This reverts commit 99b80d9784.
2023-02-16 18:01:12 +11:00
eyespy 99b80d9784 DID I HEAR A ROCK AND STONE?!?!?!!?!
FOR KARL!!
2023-02-16 17:48:49 +11:00
Yipper Yapper edf2aa8d90 New drink 2021-07-28 03:56:48 -07:00
Archie 6986dbc4dc Fixes several things 2021-06-11 18:14:57 -03:00
Chloe Carver-Brown 8872b20c42 Woah! 2021-05-20 10:34:18 +01:00
QuoteFox 9c61a94d9e jani sprites, drink sprites, and no super large monkey energry 2021-04-20 21:38:06 +01:00
DragonTrance 7e4585297f funny cum-looking drink 2021-02-24 19:26:59 -07:00
DragonTrance aac2f47e38 i hope to god this doesnt make it conflicted again 2021-02-21 12:08:59 -07:00
DragonTrance 0dea34de3a test 2021-02-21 12:03:05 -07:00
DragonTrance 18b188f46e conflicts 2021-02-21 11:42:04 -07:00
DragonTrance 187471f0af #1 2021-02-08 19:15:44 -07:00
Dahlular bb892c90e4 New Cargo Crates, Moves Some Around
Diminicillin + Prospacillin cargo crates, and moves some other crates around. Removes an offensive comment.
2021-01-15 22:38:24 -07:00
Ghom 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dip 6b6ace1726 drinkfix 2020-10-30 04:21:03 -03:00
kevinz000 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
Dip 727b826d1b better sprites 2020-10-28 05:12:36 -03:00
kevinz000 f1f89cbb50 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2020-10-28 05:12:18 -03:00
CygnusB 15226560c6 Fixes missing wataur sprite
i'm a monkey and somehow skipped uploading the .dmi for the wataur sprite
2020-06-28 17:38:49 -03:00
Kabra_men 0bc9c56892 New sprites for glass of milk and semen 2020-06-16 20:08:17 -03:00
Improvedname f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Vladin Ampora 2f94cd2a80 New drinks.dmi!
BAP x2!
2020-03-10 21:07:32 -04:00
Vladin Ampora c53fb64d7d This is old. Begone.
BAP!
2020-03-10 21:06:22 -04:00
Azarak dea2f73497 Drink updates 2020-02-03 20:23:39 +01:00
Azarak b50237fd02 Re-adds neurotoxin and adds neurosmash 2020-01-29 23:41:17 +01:00
Seris02 769c1c8e8b adds sin's delight, hellfire and gunfire 2019-12-08 12:32:32 +08:00
Quotefox 7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00