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

..

bones.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

brainrepair.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

encased.dm

Fixes #7259

2015-01-16 14:18:51 +03:00

eye.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

face.dm

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

2014-09-10 22:14:37 +01:00

generic.dm

Fixes #7787

2015-01-15 18:59:39 +03:00

headreattach.dm

Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.

2014-12-24 16:06:00 +10:30

implant.dm

Merge branch origin/dev into dev

2015-01-10 02:25:26 +06:00

organs_internal.dm

Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.

2014-12-24 16:06:00 +10:30

other.dm

Fixes #7742.

2015-01-09 08:58:11 +10:30

robolimbs.dm

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

slimes.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

surgery.dm

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00