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

Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm

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

..

dead

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

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

freelook

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

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

language

Fixes tajaran name generation, tweaks

2015-06-10 00:53:24 -04:00

living

Fixes projectiles being able to hit humans in organs they do not have.

2015-07-28 20:23:26 -04:00

new_player

Merge pull request #10059 from Baystation12/master

2015-07-09 08:34:43 +02:00

animations.dm

Clean up world print

2015-05-20 00:35:26 -04: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

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

2015-05-12 14:39:21 +02: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