PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

dead

Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums

2015-08-20 14:16:35 +02:00

freelook

Merge pull request #10004 from PsiOmegaDelta/150703-AISight

2015-08-22 02:21:36 +09:30

language

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

living

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

new_player

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04: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

…

hear_say.dm

…

holder.dm

Minor holder refactor.

2015-08-13 17:31:42 +09:30

inventory.dm

…

login.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

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

Fixes #9326

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