PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

assembly.dm

…

bomb.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

helpers.dm

…

holder.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

igniter.dm

…

infrared.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

mousetrap.dm

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

proximity.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

shock_kit.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

signaler.dm

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

timer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

voice.dm

…