Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

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

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

blob

…

carbon

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

2014-06-30 23:44:46 +01:00

silicon

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

2014-06-30 23:44:46 +01:00

simple_animal

Improves the display of shuttle ETAs

2014-06-30 18:00:28 -04:00

damage_procs.dm

Fixes projectile sharp and edge flags being ignored

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

living_defense.dm

Armour can turn sharp attacks into blunt ones

2014-06-18 10:28:23 -04:00

living_defines.dm

Changes most viable, used entries of plasma with phoron.

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

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

Tweaks nonverbal emote frequency

2014-06-28 12:20:20 -04:00