Razharas f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

organs

…

appendectomy.dm

…

brain_removal.dm

…

cavity_implant.dm

…

core_removal.dm

…

eye_surgery.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

gender_reassignment.dm

…

generic_steps.dm

…

helpers.dm

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +03:00

implant_removal.dm

Fixes implants not updating the implant secHUD

2014-11-27 12:56:17 -03:00

limb augmentation.dm

removing comment.

2014-09-21 22:26:18 +02:00

lipoplasty.dm

Making nutrition level values into defines.

2014-12-13 17:15:35 +01:00

multiple_location_example.dm

…

plastic_surgery.dm

…

surgery_step.dm

…

surgery.dm

…

tools.dm

…

xenomorph_removal.dm

…