PsiOmega 3ad8f4ca24 Merge branch 'dev' into Pics ...

Conflicts:
	code/modules/paperwork/photography.dm

2014-07-29 16:45:55 +02:00

..

blob

…

carbon

Merge pull request #5832 from Baystation12/master

2014-07-29 18:37:19 +04:00

silicon

Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.

2014-07-29 15:45:22 +02:00

simple_animal

Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

2014-07-27 03:20:16 +09:30

damage_procs.dm

Fixes projectile sharp and edge flags being ignored

2014-06-16 19:17:20 -04:00

living_defense.dm

Moves human specific hitby code to human_defense

2014-07-15 02:33:27 -04:00

living_defines.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

living.dm

borer detatch fixes

2014-07-20 04:40:58 +02:00

login.dm

Mutiny Mode

2014-05-11 15:03:50 -05:00

logout.dm

…

say.dm

Merge pull request #5654 from PsiOmegaDelta/StateLaws

2014-07-17 23:56:07 +09:30