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

Browse Source

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>

...

This commit is contained in:

Cael_Aislinn

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

parent 5855d767ae c2f2416171

commit 4c500f8b1c

121 changed files with 8992 additions and 7779 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/game/objects/effects/effect_system.dm

+1086

File diff suppressed because it is too large Load Diff