Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl

2014-07-18 13:15:30 +00:00

..

blob

…

carbon

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2014-07-17 20:57:06 +09:30

silicon

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

2014-07-18 13:15:30 +00:00

simple_animal

Slime update

2014-07-13 17:37:30 +04:00

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

…

living.dm

Fixes #5193

2014-06-23 02:53:09 -04: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