Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

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

2012-10-22 19:35:03 +10:00

..

assembly.dm

Single tank bombs.

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

bomb.dm

Fixes an issue where areas were set with luminosity = 1. Not sure why the hell I done that and why the hell I never noticed it. Thanks Kor.

2012-09-17 02:27:12 +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

Added ability to rig fueltanks

2012-10-20 22:31:13 +04: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

Fixes issue 865.

2012-09-15 23:37:20 +00:00

signaler.dm

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

2012-10-15 23:17:18 +10:00

timer.dm

Single tank bombs.

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