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

..

simulated

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

2012-10-05 22:21:26 +10:00

space

The icon_state of space turfs is now generated by jumbling up its x y and z coordinates. This means when space turfs get deleted the icon_state doesn't change each time and look stupid.

2012-10-11 21:59:01 +00:00

unsimulated

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

simulated.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

turf.dm

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

2012-10-05 22:21:26 +10:00

unsimulated.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00