phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ...

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

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

..

organs

Fixed bugs.

2015-03-21 11:53:54 +00:00

appendectomy.dm

Adds a necessary check against surgeries on Robotic organs

2013-11-20 18:19:22 +00:00

brain_removal.dm

Completed the transition to a new proc

2013-12-17 22:56:04 +04:00

cavity_implant.dm

Fixes cavity implant surgery not respecting NODROP

2015-03-08 16:35:46 -04:00

core_removal.dm

slime from carbon to simple animal

2015-03-14 23:40:57 +01:00

cybernetic_implants.dm

Code tweaks. Designs are now in 'Medical'.

2015-03-20 22:57:52 +00:00

eye_surgery.dm

Added datum mutations

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

gender_reassignment.dm

Adds a necessary check against surgeries on Robotic organs

2013-11-20 18:19:22 +00:00

generic_steps.dm

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

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

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

multiple_location_example.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

plastic_surgery.dm

Facial Reconstruction Surgery

2013-05-08 08:52:38 -06:00

remove_embedded_object.dm

Minor cleanup + Committing the surgery

2015-02-13 13:08:45 +00:00

surgery_step.dm

Adds a full assortment of surgery tools to the mediborg

2015-02-14 14:04:26 -05:00

surgery.dm

Modernized the UI of the operation computer.

2014-07-01 21:20:50 +01:00

tools.dm

Removed an unused suicide_act proc belonging to the scalpel.

2014-07-02 09:27:06 +10:00

xenomorph_removal.dm

Fixes multiple embryos in single host

2013-12-01 08:52:34 +02:00