13 Commits

Author	SHA1	Message	Date
Anon	689f238a80	Merge remote-tracking branch 'origin/master'	2020-02-20 19:09:04 -05:00
Arokha Sieyes	5b15917d32	to_chat replacing stream operator	2020-02-17 13:14:08 -05:00
Atermonera	a47090f490	Merge pull request #6659 from Darlantanis/MetamorphicPintGlas ... Metamorphic Pint Glass	2020-02-12 21:30:32 -08:00
LeighKnapenberger	d53490639d	Fixes Mint Apple Sparkle having a recipe, but no drink	2020-02-10 22:54:16 -05:00
Woodratt	512fe09064	2020 Civilian Overhaul ... - Added sofas (no options to build one in round yet, will be added after this pull). - Add neonsigns, currently one neon sign, Cafe. (Code is copy pasta from holosigns). - Add boxes with mugs and cups. - Neon signs and holosigns now emit light while on. - Merged the Coffee Shop with the Library. - Moved the Locker Room to where the Coffee Shop was, adjusted the holodeck. - Old Locker Room turned into a construction area. - Adjusted holodeck maps to new orientation. - Changed sprite of barcode scanner. - Cleaned up furniture icon dmi, fixed arm rest icons for shuttle chairs.	2020-02-02 23:58:26 -08:00
Nadyr	26b5e7aedb	-Adds a metamorphic pint glass ... -Adds said glass to the booze-o-mat -Adds the icon for said glass -Fixes metaglass icons for mojito and goldschlager	2020-01-28 23:33:22 -05:00
Schnayy	0b8ca6267d	Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644)	2020-01-23 20:50:53 -08:00
MagmaRam	02ae1026f5	Fixes the metamorphic glass sprite for the B-52	2019-07-26 17:50:19 -05:00
GeneriedJenelle	5c7c959949	Adds Cider Bottles (#6201) ... * Adds Cider How has SS13 alcohol gone on so long without cider? Let's fix that. * Update cartridge_presets.dm * Update dispenser2_energy.dm * Update dispenser_presets.dm * Adds cider bottle sprite + adds to borgs * Update Chemistry-Reagents-Food-Drinks.dm * Removes additional cider entry	2019-06-18 19:04:35 -05:00
Heroman	b85b76eff7	Also makes protein shake and glass in general initialize	2019-04-13 08:30:47 +10:00
Heroman	b8cda8b5fc	Changes shakers to use initialize	2019-04-12 17:29:19 +10:00
Heroman3003	8b6a62a496	Adds eggnog.	2019-01-08 12:31:42 +10:00
lbnesquik	5641b828c5	Move almost everythign food related into the kitchen module. ... Not moving reagents and tools.	2018-10-05 02:56:36 +02:00