Pete Goodfellow c7c3bd48de Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun ...

Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html

2013-06-15 18:58:11 +01:00

..

assembly.dm

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

bomb.dm

Removed var/special_assembly from assembly_holder as it was unused.

2013-05-28 17:29:41 +01: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

Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun

2013-06-15 18:58:11 +01:00

igniter.dm

Made mousetraps an assembly.

2012-10-27 16:39:52 +00:00

infrared.dm

onetankbombs not passing stuff to bombassemblys

2013-04-18 21:15:56 -07:00

mousetrap.dm

Adding lost pulls #590 #528 #574 #563 #529

2013-05-26 13:02:13 -06:00

proximity.dm

Committed SuperSayu's grenade assemblies patch (with slime core functionality).

2013-02-11 18:23:46 +00:00

shock_kit.dm

Fixes issue 865.

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

signaler.dm

NTSL Update:

2013-02-13 21:43:34 +00:00

timer.dm

Committed SuperSayu's grenade assemblies patch (with slime core functionality).

2013-02-11 18:23:46 +00:00

voice.dm

Adds a new assembly, the voice analyzer!

2013-05-13 15:44:37 +01:00