Kelenius 6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm

2015-08-21 16:59:57 +03:00

..

dead

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

2015-08-17 09:44:21 +02:00

freelook

Misc.

2015-08-11 17:33:03 +02:00

language

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

2015-08-15 11:06:03 +02:00

living

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

new_player

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

death.dm

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

2015-07-27 10:20:20 +02:00

emote.dm

…

gender.dm

Changes gender-based words to use a datum list instead of switches.

2015-07-15 20:04:33 +01:00

hear_say.dm

…

holder.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

inventory.dm

Fixes issues with raider equipping

2015-07-04 16:32:35 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

mob_grab.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

mob_helpers.dm

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

2015-08-18 18:05:16 +02:00

mob_movement.dm

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

mob_transformation_simple.dm

…

mob.dm

Diagonal, ctrl+dir, and alt+dir actions are now consistent with client.dir

2015-08-18 16:05:37 +01:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Fixes #9326

2015-07-26 14:57:49 -04:00