Cael_Aislinn 4c500f8b1c Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/devices/uplinks.dm
	code/game/objects/weapons.dm
	code/modules/mining/mine_items.dm
	html/changelog.html
	icons/obj/chemical.dmi
	maps/tgstation.2.0.9.dmm

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

2012-08-24 21:55:58 +10:00

..

archived_book.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

Uristrunes.dm

Yep, thee was a bug.

2012-05-24 02:29:54 -04:00