phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2 ...

Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

2015-04-08 19:36:49 +02:00

..

drinks

Adding the chemical reactions and recipes for the new recipes.

2015-04-04 19:29:12 +02:00

drinks.dm

Fixes alien and simple animal being unable to attack porta_turret (like the AI turrets). Making a take_damage() proc to update the turret's health.

2015-03-31 00:09:55 +02:00