PsiOmega 889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm

2015-08-09 13:15:22 +02:00

..

dead

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

2015-07-30 10:38:44 +02:00

freelook

Fixes #9611

2015-08-01 21:10:48 +09:30

language

Fixes #10358, #10359 and #10257

2015-08-01 23:17:27 +09:30

living

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

2015-08-09 13:15:22 +02:00

new_player

revert chargen rendering rework

2015-08-01 11:35:53 +01:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

death.dm

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

emote.dm

…

hear_say.dm

…

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

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

mob_grab.dm

Merge pull request #9779 from Baystation12/master

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

mob_helpers.dm

Fixes #10258

2015-07-28 20:17:32 -04:00

mob_movement.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

mob_transformation_simple.dm

…

mob.dm

Fixes #10230

2015-07-18 23:27:09 -04:00

say.dm

…

transform_procs.dm

Fixes #9244.

2015-05-18 19:15:28 +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

Fixes #9326

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