Ccomp5950 91c56c6e77 Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers. ...

Typo fix:  Added taquilla back in, it's ID wasn't correct in the reagent list for booze dispenser.

added watermellon juice to the soda machine.

Todo:  Fix NanoUI for these to now mention beakers, and have enough space to list watermellon juice

2013-11-22 21:46:11 -06:00

..

admin

Merge pull request #3895 from Baystation12/master

2013-11-07 16:31:43 -08:00

assembly

…

awaymissions

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

client

Made the telesci console a proper NanoUI

2013-11-13 08:01:00 -05:00

clothing

Merge pull request #3832 from Nanai/dev

2013-10-27 16:21:10 -07:00

customitems

Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo.

2013-10-27 19:17:45 -04:00

destilery

…

detectivework

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

economy

Merge pull request #3803 from Nanai/dev

2013-10-21 04:30:15 -07:00

events

derp

2013-11-05 03:17:44 +04:00

ext_scripts

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

flufftext

…

food

Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad.

2013-09-30 02:02:49 -04:00

genetics

…

icon generation

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

library

Added two new manuals by MagmaRam to the default engineering manual bookcase.

2013-10-27 18:25:25 -04:00

liquid

…

maps

…

mining

Fixed Copypasta!

2013-11-02 11:17:17 -07:00

mob

Forgot to remove lying icons / need for them for monkeys. Ook.

2013-11-06 23:54:13 +04:00

nano

Multiple minor updates to Nano.

2013-09-19 01:39:59 +01:00

organs

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

paperwork

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2013-10-15 10:56:50 +04:00

power

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

projectiles

Changed the embed check to use its own var instead of checking damagetype

2013-10-31 22:05:58 -04:00

reagents

Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers.

2013-11-22 21:46:11 -06:00

recycling

fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected

2013-10-29 05:10:17 +10:00

research

Updated paths for smoke generator

2013-11-06 22:44:56 +04:00

scripting

…

security levels

Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station.

2013-11-07 16:02:57 -08:00

surgery

Small fix for head reattachment surgery.

2013-10-30 17:20:18 -04:00

telesci

Made the telesci console a proper NanoUI

2013-11-13 08:01:00 -05:00

virus2

GC's virus dummies #whoa #derp

2013-11-05 01:13:49 +04:00