PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm

2015-03-05 08:05:44 +01: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

Adds drying racks and updates pipes

2015-01-16 02:57:59 +03:00

face.dm

Adds drying racks and updates pipes

2015-01-16 02:57:59 +03:00

generic.dm

Merge branch 'dev' into ofDryingAndRacks

2015-02-03 20:51:27 +03:00

headreattach.dm

Adds drying racks and updates pipes

2015-01-16 02:57:59 +03:00

implant.dm

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03: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

Adds drying racks and updates pipes

2015-01-16 02:57:59 +03: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 remote-tracking branch 'upstream/master' into dev-freeze

2015-03-05 08:05:44 +01:00