Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm

2015-08-21 16:15:07 +03:00

..

dead

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

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

freelook

…

language

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

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

living

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

new_player

Merge pull request #10101 from mwerezak/shards

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

animations.dm

…

death.dm

…

emote.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

…

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

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03: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 branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

mob_transformation_simple.dm

…

mob.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…