Cael_Aislinn f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649) ...

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

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

2012-09-08 14:22:44 +10:00

..

assembly.dm

Single tank bombs.

2012-09-07 13:39:13 +00:00

bomb.dm

Single tank bombs.

2012-09-07 13:39:13 +00:00

helpers.dm

Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!

2012-08-26 22:44:04 +00:00

holder.dm

Single tank bombs.

2012-09-07 13:39:13 +00:00

igniter.dm

Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!

2012-08-26 22:44:04 +00:00

infrared.dm

Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!

2012-08-26 22:44:04 +00:00

proximity.dm

Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!

2012-08-26 22:44:04 +00:00

shock_kit.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

signaler.dm

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

2012-09-08 14:22:44 +10:00

timer.dm

Single tank bombs.

2012-09-07 13:39:13 +00:00