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

Browse Source

Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html

...

This commit is contained in:

Chinsky

2013-01-22 20:05:45 +04:00

parent f04185024a 826a70bbce

commit 9792a1c983

17 changed files with 1434 additions and 2217 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/modules/reagents/Chemistry-Reagents.dm

+1356 -2154

File diff suppressed because it is too large Load Diff