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

Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-08-27 08:53:22 +02:00

..

dead

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

2015-08-17 09:37:49 +02:00

freelook

Fixes #10819

2015-08-23 14:34:58 -04:00

language

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

2015-08-15 10:52:17 +02:00

living

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

2015-08-27 08:53:22 +02:00

new_player

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

2015-08-22 15:28:49 +01: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

…

hear_say.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

holder.dm

…

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

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

2015-08-15 10:52:17 +02:00

mob_grab.dm

Makes grab eye attacking respect species lore better

2015-07-14 00:25:53 -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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-06 08:12:38 +02:00

mob_transformation_simple.dm

…

mob.dm

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

2015-08-17 09:37:49 +02:00

say.dm

…

transform_procs.dm

Base Life-addition()

2015-06-13 13:36:08 +02:00

typing_indicator.dm

…

update_icons.dm

Fixes #9326

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