Cael_Aislinn 419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

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

2012-10-12 17:53:17 +10:00

..

beams.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

bullets.dm

Added Syndicate NPCs/sprites for them. They come in a few varieties, some with shields and swords, some with guns(yes they shoot). They're simple animals, but they drop a corpse landmark when they die, so you can loot them normally.

2012-10-09 19:22:14 +00:00

change.dm

made staff of change have a chance to properly turn into skrell/taj/sog

2012-08-25 03:34:59 +10:00

energy.dm

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

special.dm

Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

2012-08-28 20:22:22 +10:00