Cael_Aislinn 20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

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

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-01-21 05:05:17 +10:00

..

rightandwrong.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

soulstone.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

spellbook.dm

-Re-implemented fireballs to use dumbfire, so you don't choose a target but instead it just shoots in the direction of the user. Changed the cooldown back to 10.

2012-12-05 17:54:58 +00:00

spells.dm

-Chemical implants can now hold 50 units instead of 10.

2012-11-15 08:03:05 +00:00

veilrender.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-22 20:15:05 +10:00

wizard.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00