Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev ...

Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm

2015-02-04 04:44:09 +06:00

..

blob

Refactors a lot of reused/redundant death code, fixes #7224

2014-12-07 17:18:56 +10:30

carbon

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

silicon

Merge pull request #7952 from PsiOmegaDelta/AIEye

2015-02-03 18:14:08 +03:00

simple_animal

Fixes #7919

2015-01-29 11:27:56 +10:30

damage_procs.dm

…

living_defense.dm

Mob fire adjustments

2015-02-01 12:11:43 -05:00

living_defines.dm

Stupid typo & missing constants

2015-02-03 18:44:26 +03:00

living_powers.dm

Fixes #7223 and #6966, adds inhand and suit sprites for nymphs.

2014-12-07 20:44:11 +10:30

living.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

login.dm

Overhauls SSD mechanic.

2014-12-27 09:16:50 -08:00

logout.dm

Fixes a comment, bleh.

2014-12-27 10:57:13 -08:00

say.dm

Fixes #7262

2014-12-07 21:20:24 +10:30