PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm

2015-04-08 10:55:26 +02:00

..

binary_devices

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-04-03 09:22:23 +02:00

omni_devices

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

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

trinary_devices

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

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

unary

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

2015-04-08 10:55:26 +02:00

portables_connector.dm

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

tvalve.dm

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

valve.dm

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00