PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

dead

Admin JMP now includes a link to EYE or BDY if any.

2015-06-10 11:08:31 +02:00

freelook

Fixes #9517 and #9542

2015-06-10 23:14:33 +09:30

language

All the span-corrected dm files.

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

living

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

2015-06-26 20:28:47 +02:00

new_player

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

2015-06-26 20:28:47 +02:00

animations.dm

…

death.dm

Base Life-addition()

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

emote.dm

…

hear_say.dm

All the span-corrected dm files.

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

holder.dm

Allows pAIs to be scooped up and worn as hats.

2015-05-26 15:15:15 +09:30

inventory.dm

Items again have their loc set just before dropped() is called.

2015-05-21 17:55:31 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Base Life-addition()

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

mob_grab.dm

Merge pull request #9779 from Baystation12/master

2015-06-10 11:04:54 +02:00

mob_helpers.dm

Admin JMP now includes a link to EYE or BDY if any.

2015-06-10 11:08:31 +02:00

mob_movement.dm

Base Life-addition()

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

mob_transformation_simple.dm

…

mob.dm

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

2015-06-16 10:52:33 +02:00

say.dm

…

transform_procs.dm

Base Life-addition()

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

typing_indicator.dm

Fixes corpses and unconscious people still showing typing indicators.

2015-05-30 03:13:45 +03:00

update_icons.dm

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

2015-06-26 19:22:31 +02:00