bgobandit a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag ...

Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme

2015-12-17 20:12:32 -05:00

..

organs

adds feature inheritance, fixes recipe

2015-12-12 02:40:23 -05:00

cavity_implant.dm

Line ending apocalypse

2015-12-17 14:12:37 +13:00

core_removal.dm

Surgery & Organs Rework: Phase 2

2015-08-06 09:56:54 +03:00

dental_implant.dm

Checks work better when you actually check them.

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

dethralling.dm

Re-adds dethralling surgery and speeds up enthralling

2015-11-01 01:39:01 -04:00

eye_surgery.dm

Surgery & Organs Rework: Phase 2

2015-08-06 09:56:54 +03:00

gender_reassignment.dm

…

generic_steps.dm

adds chainsaws to ghetto sawing tools

2015-11-23 22:33:13 -08:00

helpers.dm

Changes the operating table to be an actual table.

2015-11-08 22:09:35 +02:00

implant_removal.dm

…

limb augmentation.dm

Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats.

2015-12-11 19:03:09 -05:00

lipoplasty.dm

Syndicate medical cyborgs

2015-09-17 20:02:48 -04:00

organ_manipulation.dm

Adds a critical S

2015-10-08 22:19:11 -04:00

plastic_surgery.dm

Fixes Sec Hud wanted status not being updated when changing identity. Original PR by Astralenigma, New one by phil235.

2015-10-19 21:22:05 +02:00

remove_embedded_object.dm

…

surgery_step.dm

Surgery & Organs Rework: Phase 2

2015-08-06 09:56:54 +03:00

surgery.dm

Fixes and changes

2015-08-12 20:31:35 +03:00

tail_modification.dm

adds feature inheritance, fixes recipe

2015-12-12 02:40:23 -05:00

tools.dm

Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().

2015-09-24 03:08:28 +01:00