PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm

2015-09-27 13:36:56 +02:00

..

dead

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

2015-09-27 13:36:56 +02:00

freelook

Fixes #10819

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

language

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

2015-09-05 09:24:30 +02:00

living

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

2015-09-27 13:36:56 +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

…

emote.dm

…

hear_say.dm

…

holder.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-31 16:17:24 +09:30

inventory.dm

Converts some loc = to forceMove()

2015-09-14 11:13:15 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2015-09-27 13:36:56 +02:00

mob_grab_specials.dm

Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon

2015-09-09 19:49:46 -04:00

mob_grab.dm

Cleans up mob_grab.dm

2015-08-18 22:02:01 -04:00

mob_helpers.dm

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

2015-09-11 08:38:28 +02:00

mob_movement.dm

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

2015-09-15 20:25:13 +02:00

mob_transformation_simple.dm

…

mob.dm

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

2015-09-15 20:25:13 +02:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…